diff --git a/templates.fif.json b/templates.fif.json
index 7b49e5b7..bf00bd03 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -91,12 +91,14 @@
         "BaseOS-boot-iso": {
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
+                "INSTALL_RETRY": "",
                 "TEST_TARGET": "ISO"
             }
         },
         "BaseOS-dvd-iso": {
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
+                "INSTALL_RETRY": "",
                 "TEST_TARGET": "ISO"
             }
         },
@@ -114,12 +116,14 @@
             "settings": {
                 "CANNED": "1",
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
+                "INSTALL_RETRY": "",
                 "TEST_TARGET": "ISO",
                 "USER_LOGIN": "false"
             }
         },
         "Everything-boot-iso": {
             "settings": {
+                "INSTALL_RETRY": "",
                 "TEST_TARGET": "ISO"
             }
         },
@@ -127,6 +131,7 @@
             "settings": {
                 "CANNED": "1",
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
+                "INSTALL_RETRY": "",
                 "PACKAGE_SET": "default",
                 "TEST_TARGET": "ISO"
             }
@@ -136,7 +141,7 @@
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
                 "DESKTOP": "kde",
                 "HDDSIZEGB": "15",
-                "INSTALL_RETRY": "5",
+                "INSTALL_RETRY": "1",
                 "LIVE": "1",
                 "PACKAGE_SET": "default",
                 "TEST_TARGET": "ISO"
@@ -153,7 +158,7 @@
             "settings": {
                 "DESKTOP": "i3",
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
-                "INSTALL_RETRY": "5",
+                "INSTALL_RETRY": "1",
                 "LIVE": "1",
                 "PACKAGE_SET": "default",
                 "TEST_TARGET": "ISO",
@@ -168,12 +173,14 @@
         },
         "Server-boot-iso": {
             "settings": {
+                "INSTALL_RETRY": "",
                 "TEST_TARGET": "ISO"
             }
         },
         "Server-dvd-iso": {
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
+                "INSTALL_RETRY": "",
                 "TEST_TARGET": "ISO"
             }
         },
@@ -189,6 +196,7 @@
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
                 "DESKTOP": "gnome",
                 "HDDSIZEGB": "20",
+                "INSTALL_RETRY": "",
                 "PACKAGE_SET": "default",
                 "RETRY": "2",
                 "TEST_TARGET": "ISO"
@@ -199,6 +207,7 @@
                 "DESKTOP": "gnome",
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
                 "HDDSIZEGB": "20",
+                "INSTALL_RETRY": "1",
                 "LIVE": "1",
                 "PACKAGE_SET": "default",
                 "TEST_TARGET": "ISO"
@@ -353,10 +362,7 @@
         },
         "fedora-Workstation-live-iso-x86_64-*": {
             "arch": "x86_64",
-            "flavor": "Workstation-live-iso",
-            "settings": {
-                "INSTALL_RETRY": "5"
-            }
+            "flavor": "Workstation-live-iso"
         },
         "fedora-Workstation-upgrade-x86_64-*": {
             "arch": "x86_64",
@@ -1289,6 +1295,7 @@
                 "LANGUAGE": "japanese",
                 "POSTINSTALL": "_console_login",
                 "QEMU_DISABLE_SNAPSHOTS": "1",
+                "RETRY": "%INSTALL_RETRY%",
                 "ROOT_PASSWORD": "weakpassword",
                 "USER_LOGIN": "qwerty"
             }
@@ -1446,6 +1453,7 @@
                 "LANGUAGE": "russian",
                 "POSTINSTALL": "_console_login",
                 "QEMU_DISABLE_SNAPSHOTS": "1",
+                "RETRY": "%INSTALL_RETRY%",
                 "ROOT_PASSWORD": "weakpassword",
                 "USER_LOGIN": "qwerty"
             }
@@ -1546,6 +1554,7 @@
                 "LAYOUT": "french",
                 "POSTINSTALL": "_console_login",
                 "QEMU_DISABLE_SNAPSHOTS": "1",
+                "RETRY": "%INSTALL_RETRY%",
                 "USER_LOGIN": "qwerty"
             }
         },
@@ -1979,6 +1988,7 @@
             "settings": {
                 "PARTITIONING": "webui_ext4",
                 "POSTINSTALL": "disk_custom_blivet_standard_partition_ext4_postinstall",
+                "RETRY": "%INSTALL_RETRY%",
                 "ROOT_PASSWORD": "weakpassword"
             }
         },
@@ -1990,6 +2000,7 @@
             "settings": {
                 "PARTITIONING": "webui_xfs",
                 "POSTINSTALL": "disk_custom_xfs_postinstall",
+                "RETRY": "%INSTALL_RETRY%",
                 "ROOT_PASSWORD": "weakpassword"
             }
         },