diff --git a/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java b/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
index a6aecf477f78..2e45d567357e 100644
--- a/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
+++ b/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
@@ -315,11 +315,11 @@ public void setUpdated(Date updated) {
     public static final List<Pair<Hypervisor.HypervisorType, CPU.CPUArch>> hypervisorList = Arrays.asList(
             new Pair<>(Hypervisor.HypervisorType.KVM, CPU.CPUArch.amd64),
             new Pair<>(Hypervisor.HypervisorType.KVM, CPU.CPUArch.arm64),
-            new Pair<>(Hypervisor.HypervisorType.VMware, null),
-            new Pair<>(Hypervisor.HypervisorType.XenServer, null),
-            new Pair<>(Hypervisor.HypervisorType.Hyperv, null),
-            new Pair<>(Hypervisor.HypervisorType.LXC, null),
-            new Pair<>(Hypervisor.HypervisorType.Ovm3, null)
+            new Pair<>(Hypervisor.HypervisorType.VMware, CPU.CPUArch.amd64),
+            new Pair<>(Hypervisor.HypervisorType.XenServer, CPU.CPUArch.amd64),
+            new Pair<>(Hypervisor.HypervisorType.Hyperv, CPU.CPUArch.amd64),
+            new Pair<>(Hypervisor.HypervisorType.LXC, CPU.CPUArch.amd64),
+            new Pair<>(Hypervisor.HypervisorType.Ovm3, CPU.CPUArch.amd64)
     );
 
     public static final Map<String, MetadataTemplateDetails> NewTemplateMap = new HashMap<>();
diff --git a/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java b/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java
index 8c2fe43c9d3c..aad8760ed77a 100644
--- a/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java
+++ b/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java
@@ -155,7 +155,7 @@ public void test_parseMetadataFile_success() {
         templateDetails =
                 SystemVmTemplateRegistration.NewTemplateMap.get("vmware");
         assertNotNull(templateDetails);
-        assertNull(templateDetails.getArch());
+        assertEquals(CPU.CPUArch.amd64, templateDetails.getArch());
         assertEquals(Hypervisor.HypervisorType.VMware, templateDetails.getHypervisorType());
     }