diff --git a/templates b/templates
index 31b55784..d8154fce 100755
--- a/templates
+++ b/templates
@@ -1340,7 +1340,7 @@
                       name => "support_server",
                       settings => [
                         { key => "NUMDISKS", value => "2" },
-                        { key => "HDD_1", value => "disk_f%CURRREL%_support_2_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%CURRREL%_support_3_x86_64.img" },
                         { key => "POSTINSTALL", value => "_support_server" },
                         { key => "USER_LOGIN", value => "false" },
                         { key => "ROOT_PASSWORD", value => "weakpassword" },
@@ -1538,7 +1538,7 @@
                         { key => "ROOT_PASSWORD", value => "weakpassword" },
                         { key => "USER_LOGIN", value => "false" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f%CURRREL%_minimal_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%CURRREL%_minimal_2_x86_64.img" },
                         { key => "UPGRADE", value => "1" },
                       ],
                     },
@@ -1549,7 +1549,7 @@
                         { key => "USER_LOGIN", value => "test" },
                         { key => "USER_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f%CURRREL%_desktop_2_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%CURRREL%_desktop_3_x86_64.img" },
                         { key => "UPGRADE", value => "1" },
                         { key => "DESKTOP", value => "gnome" },
                       ],
@@ -1561,7 +1561,7 @@
                         { key => "USER_LOGIN", value => "test" },
                         { key => "USER_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f%CURRREL%_server_2_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%CURRREL%_server_3_x86_64.img" },
                         { key => "UPGRADE", value => "1" },
                       ],
                     },
@@ -1572,7 +1572,7 @@
                         { key => "USER_LOGIN", value => "test" },
                         { key => "USER_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f%CURRREL%_kde_2_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%CURRREL%_kde_3_x86_64.img" },
                         { key => "UPGRADE", value => "1" },
                         { key => "DESKTOP", value => "kde" },
                       ],
@@ -1583,7 +1583,7 @@
                         { key => "ROOT_PASSWORD", value => "weakpassword" },
                         { key => "USER_LOGIN", value => "false" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f%PREVREL%_minimal_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%PREVREL%_minimal_2_x86_64.img" },
                         { key => "UPGRADE", value => "1" },
                       ],
                     },
@@ -1594,7 +1594,7 @@
                         { key => "USER_LOGIN", value => "test" },
                         { key => "USER_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f%PREVREL%_desktop_2_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%PREVREL%_desktop_3_x86_64.img" },
                         { key => "UPGRADE", value => "1" },
                         { key => "DESKTOP", value => "gnome" },
 
@@ -1607,7 +1607,7 @@
                         { key => "USER_LOGIN", value => "test" },
                         { key => "USER_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f%PREVREL%_server_2_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%PREVREL%_server_3_x86_64.img" },
                         { key => "UPGRADE", value => "1" },
                       ],
                     },
@@ -1618,7 +1618,7 @@
                         { key => "USER_LOGIN", value => "test" },
                         { key => "USER_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f%PREVREL%_kde_2_x86_64.img" },
+                        { key => "HDD_1", value => "disk_f%PREVREL%_kde_3_x86_64.img" },
                         { key => "UPGRADE", value => "1" },
                         { key => "DESKTOP", value => "kde" },
                       ],
@@ -1630,7 +1630,7 @@
                         { key => "USER_LOGIN", value => "test" },
                         { key => "USER_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f%CURRREL%_desktop_2_i686.img" },
+                        { key => "HDD_1", value => "disk_f%CURRREL%_desktop_3_i686.img" },
                         { key => "UPGRADE", value => "1" },
                         { key => "DESKTOP", value => "gnome" },
                       ],
@@ -1642,7 +1642,7 @@
                         { key => "USER_LOGIN", value => "test" },
                         { key => "USER_PASSWORD", value => "weakpassword" },
                         { key => "BOOTFROM", value => "c" },
-                        { key => "HDD_1", value => "disk_f%PREVREL%_desktop_2_i686.img" },
+                        { key => "HDD_1", value => "disk_f%PREVREL%_desktop_3_i686.img" },
                         { key => "UPGRADE", value => "1" },
                         { key => "DESKTOP", value => "gnome" },
                       ],