diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index c760756f..fd68ee7c 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -5,7 +5,7 @@
             "distri": "fedora",
             "flavor": "updates-container",
             "settings": {
-                "+HDD_1": "disk_f%VERSION%_server_4_%ARCH%.qcow2",
+                "+HDD_1": "disk_f%VERSION%_server_5_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
             },
@@ -16,7 +16,7 @@
             "distri": "fedora",
             "flavor": "updates-container",
             "settings": {
-                "+HDD_1": "disk_f%VERSION%_server_4_%ARCH%.qcow2",
+                "+HDD_1": "disk_f%VERSION%_server_5_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
             },
@@ -27,7 +27,7 @@
             "distri": "fedora",
             "flavor": "updates-container",
             "settings": {
-                "+HDD_1": "disk_f%VERSION%_server_4_%ARCH%.qcow2",
+                "+HDD_1": "disk_f%VERSION%_server_5_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
             },
@@ -60,7 +60,7 @@
             "distri": "fedora",
             "flavor": "updates-server",
             "settings": {
-                "+HDD_1": "disk_f%VERSION%_server_4_%ARCH%.qcow2",
+                "+HDD_1": "disk_f%VERSION%_server_5_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
             },
@@ -71,7 +71,7 @@
             "distri": "fedora",
             "flavor": "updates-server",
             "settings": {
-                "+HDD_1": "disk_f%VERSION%_server_4_%ARCH%.qcow2",
+                "+HDD_1": "disk_f%VERSION%_server_5_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
             },
@@ -102,7 +102,7 @@
             "distri": "fedora",
             "flavor": "updates-server",
             "settings": {
-                "+HDD_1": "disk_f%VERSION%_server_4_%ARCH%.qcow2",
+                "+HDD_1": "disk_f%VERSION%_server_5_%ARCH%.qcow2",
                 "NUMDISKS": "2",
                 "RETRY": "1"
             },
diff --git a/templates.fif.json b/templates.fif.json
index 844a0b04..2f1b2e79 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -3026,7 +3026,7 @@
                 "fedora-universal-x86_64-*-64bit": 30
             },
             "settings": {
-                "+HDD_1": "disk_f%UP2REL%_server_4_%ARCH%.qcow2",
+                "+HDD_1": "disk_f%UP2REL%_server_5_%ARCH%.qcow2",
                 "BOOTFROM": "c",
                 "NICTYPE": "tap",
                 "PARALLEL_WITH": "upgrade_2_server_domain_controller",
@@ -3048,7 +3048,7 @@
             },
             "settings": {
                 "BOOTFROM": "c",
-                "HDD_1": "disk_f%UP2REL%_server_4_%ARCH%.qcow2",
+                "HDD_1": "disk_f%UP2REL%_server_5_%ARCH%.qcow2",
                 "ROOT_PASSWORD": "weakpassword",
                 "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
@@ -3062,7 +3062,7 @@
                 "fedora-universal-x86_64-*-64bit": 30
             },
             "settings": {
-                "+HDD_1": "disk_f%UP2REL%_server_4_%ARCH%.qcow2",
+                "+HDD_1": "disk_f%UP2REL%_server_5_%ARCH%.qcow2",
                 "BOOTFROM": "c",
                 "NICTYPE": "tap",
                 "PARALLEL_CANCEL_WHOLE_CLUSTER": "0",
@@ -3211,7 +3211,7 @@
                 "fedora-universal-x86_64-*-64bit": 30
             },
             "settings": {
-                "+HDD_1": "disk_f%UP1REL%_server_4_%ARCH%.qcow2",
+                "+HDD_1": "disk_f%UP1REL%_server_5_%ARCH%.qcow2",
                 "BOOTFROM": "c",
                 "MAX_JOB_TIME": "10800",
                 "NICTYPE": "tap",
@@ -3234,7 +3234,7 @@
             },
             "settings": {
                 "BOOTFROM": "c",
-                "HDD_1": "disk_f%UP1REL%_server_4_%ARCH%.qcow2",
+                "HDD_1": "disk_f%UP1REL%_server_5_%ARCH%.qcow2",
                 "ROOT_PASSWORD": "weakpassword",
                 "TEST_TARGET": "COMPOSE",
                 "UPGRADE": "1",
@@ -3249,7 +3249,7 @@
                 "fedora-universal-x86_64-*-64bit": 30
             },
             "settings": {
-                "+HDD_1": "disk_f%UP1REL%_server_4_%ARCH%.qcow2",
+                "+HDD_1": "disk_f%UP1REL%_server_5_%ARCH%.qcow2",
                 "BOOTFROM": "c",
                 "MAX_JOB_TIME": "10800",
                 "NICTYPE": "tap",