diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index cdc24b58..143b88e5 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -380,8 +380,7 @@
                 "+START_AFTER_TEST": "%LIVE_BUILD_TEST%@%ARCH_BASE_MACHINE%",
                 "INSTALL": "1",
                 "ISO": "Fedora-%SUBVARIANT%-Live-%ARCH%-%ADVISORY_OR_TASK%.iso",
-                "QEMURAM": "4096",
-                "RETRY": "5"
+                "QEMURAM": "4096"
             }
         },
         "install_default_update_netinst": {
diff --git a/templates.fif.json b/templates.fif.json
index e6b4cd5d..efffe42b 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -5,7 +5,7 @@
             "settings": {
                 "ARCH_BASE_MACHINE": "64bit",
                 "PART_TABLE_TYPE": "mbr",
-                "QEMUCPU": "Nehalem",
+                "QEMUCPU": "host",
                 "QEMUCPUS": "2",
                 "QEMURAM": "3072",
                 "QEMU_VIDEO_DEVICE": "virtio-vga",
@@ -61,7 +61,7 @@
                 "INSECURE_PFLASH_CODE": "/usr/share/edk2/ovmf/OVMF_CODE.fd",
                 "INSECURE_PFLASH_VARS": "/usr/share/edk2/ovmf/OVMF_VARS.fd",
                 "PART_TABLE_TYPE": "gpt",
-                "QEMUCPU": "Nehalem",
+                "QEMUCPU": "host",
                 "QEMUCPUS": "2",
                 "QEMURAM": "3072",
                 "QEMU_VIDEO_DEVICE": "virtio-vga",
@@ -86,7 +86,7 @@
             "flavor": "BaseOS-boot-iso",
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
-                "+QEMUCPU": "Haswell",
+                "+QEMUCPU": "host",
                 "TEST_TARGET": "ISO"
             },
             "version": "*"
@@ -97,7 +97,7 @@
             "flavor": "BaseOS-dvd-iso",
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
-                "+QEMUCPU": "Haswell",
+                "+QEMUCPU": "host",
                 "TEST_TARGET": "ISO"
             },
             "version": "*"
@@ -659,6 +659,7 @@
             "settings": {
                 "BOOTFROM": "c",
                 "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
+                "QEMUCPU": "Nehalem",
                 "STARTSTOP": "true",
                 "START_AFTER_TEST": "%DEPLOY_UPLOAD_TEST%"
             }