diff --git a/main.pm b/main.pm
index 52a7d43e..1cfbab62 100644
--- a/main.pm
+++ b/main.pm
@@ -175,6 +175,14 @@ sub load_install_tests() {
         autotest::loadtest "tests/_anaconda_network_enable.pm";
     }
 
+    ## Kdump
+    if (get_var('ANACONDA_KDUMP') eq 'enabled') {
+        autotest::loadtest "tests/_anaconda_kdump_enable.pm";
+    }
+    else {
+        autotest::loadtest "tests/_anaconda_kdump_disable.pm";
+    }
+
     ## Installation source
     if (get_var('MIRRORLIST_GRAPHICAL') || get_var("REPOSITORY_GRAPHICAL")) {
         autotest::loadtest "tests/install_source_graphical.pm";
@@ -207,14 +215,6 @@ sub load_install_tests() {
         autotest::loadtest "tests/disk_guided_encrypted.pm";
     }
 
-    ## Kdump
-    if (get_var('ANACONDA_KDUMP') eq 'enabled') {
-        autotest::loadtest "tests/_anaconda_kdump_enable.pm";
-    }
-    else {
-        autotest::loadtest "tests/_anaconda_kdump_disable.pm";
-    }
-
     # Start installation, set user & root passwords, reboot
     # install and reboot phase is loaded automatically every time (except when KICKSTART is set)
     autotest::loadtest "tests/_do_install_and_reboot.pm";
diff --git a/needles/anaconda/install_destination/rocky-disk_guided_empty-anaconda_install_destination_delete_all_btn_selected-20220513.json b/needles/anaconda/install_destination/rocky-disk_guided_empty-anaconda_install_destination_delete_all_btn_selected-20220513.json
deleted file mode 100644
index a520b4f3..00000000
--- a/needles/anaconda/install_destination/rocky-disk_guided_empty-anaconda_install_destination_delete_all_btn_selected-20220513.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 912,
-      "ypos": 510,
-      "width": 90,
-      "height": 38,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_install_destination_delete_all_btn_selected"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/install_destination/rocky-disk_guided_empty-anaconda_install_destination_delete_all_btn_selected-20220513.png b/needles/anaconda/install_destination/rocky-disk_guided_empty-anaconda_install_destination_delete_all_btn_selected-20220513.png
deleted file mode 100644
index baaff2dd..00000000
Binary files a/needles/anaconda/install_destination/rocky-disk_guided_empty-anaconda_install_destination_delete_all_btn_selected-20220513.png and /dev/null differ
diff --git a/needles/anaconda/install_destination/rocky-disk_guided_empty-anaconda_install_destination_reclaim_space_btn_selected-20220513.json b/needles/anaconda/install_destination/rocky-disk_guided_empty-anaconda_install_destination_reclaim_space_btn_selected-20220513.json
deleted file mode 100644
index f2c02f1f..00000000
--- a/needles/anaconda/install_destination/rocky-disk_guided_empty-anaconda_install_destination_reclaim_space_btn_selected-20220513.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 878,
-      "ypos": 615,
-      "width": 124,
-      "height": 37,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_install_destination_reclaim_space_btn_selected"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/install_destination/rocky-disk_guided_empty-anaconda_install_destination_reclaim_space_btn_selected-20220513.png b/needles/anaconda/install_destination/rocky-disk_guided_empty-anaconda_install_destination_reclaim_space_btn_selected-20220513.png
deleted file mode 100644
index 03dfc437..00000000
Binary files a/needles/anaconda/install_destination/rocky-disk_guided_empty-anaconda_install_destination_reclaim_space_btn_selected-20220513.png and /dev/null differ
diff --git a/needles/anaconda/install_source/rocky-https_selected-20220514.json b/needles/anaconda/install_source/rocky-https_selected-20220514.json
new file mode 100644
index 00000000..1cd957e5
--- /dev/null
+++ b/needles/anaconda/install_source/rocky-https_selected-20220514.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 19,
+      "width": 105,
+      "ypos": 210,
+      "xpos": 56
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "ENV-FLAVOR-server",
+    "anaconda_install_source_selected"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_source/rocky-https_selected-20220514.png b/needles/anaconda/install_source/rocky-https_selected-20220514.png
new file mode 100644
index 00000000..0c9b27f8
Binary files /dev/null and b/needles/anaconda/install_source/rocky-https_selected-20220514.png differ
diff --git a/needles/anaconda/main_hub/rocky-anaconda_main_hub-20220514.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub-20220514.json
deleted file mode 100644
index 27ea8dde..00000000
--- a/needles/anaconda/main_hub/rocky-anaconda_main_hub-20220514.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "area": [
-    {
-      "width": 33,
-      "type": "match",
-      "ypos": 410,
-      "height": 33,
-      "xpos": 721
-    },
-    {
-      "xpos": 242,
-      "height": 34,
-      "ypos": 199,
-      "type": "match",
-      "width": 41
-    },
-    {
-      "height": 37,
-      "ypos": 337,
-      "xpos": 244,
-      "width": 34,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_main_hub"
-  ]
-}
\ No newline at end of file
diff --git a/needles/anaconda/main_hub/rocky-anaconda_main_hub-20220514.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub-20220514.png
deleted file mode 100644
index d35ee8e0..00000000
Binary files a/needles/anaconda/main_hub/rocky-anaconda_main_hub-20220514.png and /dev/null differ
diff --git a/needles/cockpit/rocky-autoupdate_planned_day-20220514.json b/needles/cockpit/rocky-autoupdate_planned_day-20220514.json
deleted file mode 100644
index 8d8f1649..00000000
--- a/needles/cockpit/rocky-autoupdate_planned_day-20220514.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "width": 73,
-      "type": "match",
-      "height": 21,
-      "xpos": 429,
-      "ypos": 477
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "autoupdate_planned_day"
-  ]
-}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-autoupdate_planned_day-20220514.png b/needles/cockpit/rocky-autoupdate_planned_day-20220514.png
deleted file mode 100644
index e9b98a63..00000000
Binary files a/needles/cockpit/rocky-autoupdate_planned_day-20220514.png and /dev/null differ
diff --git a/needles/cockpit/rocky-autoupdate_planned_time-20220514.json b/needles/cockpit/rocky-autoupdate_planned_time-20220514.json
deleted file mode 100644
index 74408917..00000000
--- a/needles/cockpit/rocky-autoupdate_planned_time-20220514.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 531,
-      "ypos": 475,
-      "width": 40,
-      "height": 21,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "autoupdate_planned_time"
-  ]
-}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-autoupdate_planned_time-20220514.png b/needles/cockpit/rocky-autoupdate_planned_time-20220514.png
deleted file mode 100644
index e9b98a63..00000000
Binary files a/needles/cockpit/rocky-autoupdate_planned_time-20220514.png and /dev/null differ
diff --git a/needles/cockpit/rocky-cockpit_main-20220514.json b/needles/cockpit/rocky-cockpit_main-20220514.json
deleted file mode 100644
index bd118136..00000000
--- a/needles/cockpit/rocky-cockpit_main-20220514.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "height": 27,
-      "width": 213,
-      "ypos": 548,
-      "xpos": 262
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "cockpit_main"
-  ]
-}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_main-20220514.png b/needles/cockpit/rocky-cockpit_main-20220514.png
deleted file mode 100644
index 6832a6ca..00000000
Binary files a/needles/cockpit/rocky-cockpit_main-20220514.png and /dev/null differ
diff --git a/needles/cockpit/rocky-cockpit_updates_updated-cockpit-20220514.json b/needles/cockpit/rocky-cockpit_updates_updated-cockpit-20220514.json
deleted file mode 100644
index 7bd3ff2a..00000000
--- a/needles/cockpit/rocky-cockpit_updates_updated-cockpit-20220514.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 639,
-      "ypos": 241,
-      "width": 172,
-      "height": 30,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "cockpit_updates_updated"
-  ]
-}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_updated-cockpit-20220514.png b/needles/cockpit/rocky-cockpit_updates_updated-cockpit-20220514.png
deleted file mode 100644
index 665c41ae..00000000
Binary files a/needles/cockpit/rocky-cockpit_updates_updated-cockpit-20220514.png and /dev/null differ
diff --git a/needles/cockpit/rocky-logs_entry-systemd-20220514.json b/needles/cockpit/rocky-logs_entry-systemd-20220514.json
deleted file mode 100644
index c2fbba84..00000000
--- a/needles/cockpit/rocky-logs_entry-systemd-20220514.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 374,
-      "xpos": 944,
-      "type": "match",
-      "height": 15,
-      "width": 52
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "cockpit_logs_entry"
-  ]
-}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-logs_entry-systemd-20220514.png b/needles/cockpit/rocky-logs_entry-systemd-20220514.png
deleted file mode 100644
index be051103..00000000
Binary files a/needles/cockpit/rocky-logs_entry-systemd-20220514.png and /dev/null differ
diff --git a/needles/cockpit/rocky-logs_entry_detail-20220514.json b/needles/cockpit/rocky-logs_entry_detail-20220514.json
deleted file mode 100644
index 0c08a178..00000000
--- a/needles/cockpit/rocky-logs_entry_detail-20220514.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "height": 14,
-      "type": "match",
-      "width": 145,
-      "ypos": 745,
-      "xpos": 263
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "cockpit_logs_detail"
-  ]
-}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-logs_entry_detail-20220514.png b/needles/cockpit/rocky-logs_entry_detail-20220514.png
deleted file mode 100644
index 01252adb..00000000
Binary files a/needles/cockpit/rocky-logs_entry_detail-20220514.png and /dev/null differ
diff --git a/needles/cockpit/rocky-services_detail-20220514.json b/needles/cockpit/rocky-services_detail-20220514.json
deleted file mode 100644
index 08ec5f59..00000000
--- a/needles/cockpit/rocky-services_detail-20220514.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 585,
-      "xpos": 263,
-      "type": "match",
-      "height": 28,
-      "width": 133
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "cockpit_services_detail"
-  ]
-}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-services_detail-20220514.png b/needles/cockpit/rocky-services_detail-20220514.png
deleted file mode 100644
index dc9c0628..00000000
Binary files a/needles/cockpit/rocky-services_detail-20220514.png and /dev/null differ
diff --git a/templates.fif.json b/templates.fif.json
index d88ecd61..437071e2 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -57,7 +57,6 @@
             "settings": {
                 "GRUB": "ip=dhcp",
                 "+QEMURAM": 3072,
-                "HDDSIZEGB": "15",
                 "TEST_TARGET": "ISO"
             },
             "version": "*"
@@ -69,7 +68,6 @@
             "settings": {
                 "GRUB": "ip=dhcp",
                 "+QEMURAM": 3072,
-                "HDDSIZEGB": "15",
                 "TEST_TARGET": "ISO"
             },
             "version": "*"
@@ -81,7 +79,6 @@
             "settings": {
                 "+QEMURAM": 3072,
                 "DEPLOY_UPLOAD_TEST": "install_minimal_upload",
-                "HDDSIZEGB": "15",
                 "TEST_TARGET": "ISO"
             },
             "version": "*"
@@ -93,7 +90,6 @@
             "settings": {
                 "+QEMURAM": 3072,
                 "DEPLOY_UPLOAD_TEST": "install_minimal_upload",
-                "HDDSIZEGB": "15",
                 "TEST_TARGET": "ISO"
             },
             "version": "*"
@@ -104,7 +100,6 @@
             "flavor": "dvd-iso",
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
-                "HDDSIZEGB": "15",
                 "TEST_TARGET": "ISO"
             },
             "version": "*"
@@ -115,7 +110,6 @@
             "flavor": "dvd-iso",
             "settings": {
                 "DEPLOY_UPLOAD_TEST": "install_default_upload",
-                "HDDSIZEGB": "15",
                 "TEST_TARGET": "ISO"
             },
             "version": "*"
@@ -125,7 +119,6 @@
             "distri": "rocky",
             "flavor": "package-set",
             "settings": {
-                "HDDSIZEGB": "15",
                 "TEST_TARGET": "ISO"
             },
             "version": "*"
@@ -135,7 +128,6 @@
             "distri": "rocky",
             "flavor": "package-set",
             "settings": {
-                "HDDSIZEGB": "15",
                 "TEST_TARGET": "ISO"
             },
             "version": "*"
@@ -145,7 +137,6 @@
             "distri": "rocky",
             "flavor": "universal",
             "settings": {
-                "HDDSIZEGB": "15",
                 "TEST_TARGET": "ISO"
             },
             "version": "*"
@@ -155,7 +146,6 @@
             "distri": "rocky",
             "flavor": "universal",
             "settings": {
-                "HDDSIZEGB": "15",
                 "TEST_TARGET": "ISO"
             },
             "version": "*"
@@ -358,6 +348,7 @@
             "settings": {
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
+                "HDDSIZEGB": "15",
                 "LANGUAGE": "arabic",
                 "PACKAGE_SET": "workstation",
                 "POSTINSTALL": "_console_login",
@@ -376,6 +367,7 @@
             "settings": {
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
+                "HDDSIZEGB": "15",
                 "INPUT_METHOD": "1",
                 "LANGUAGE": "japanese",
                 "PACKAGE_SET": "workstation",
@@ -442,6 +434,7 @@
             "settings": {
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
+                "HDDSIZEGB": "15",
                 "LANGUAGE": "russian",
                 "PACKAGE_SET": "workstation",
                 "POSTINSTALL": "_console_login",
@@ -462,6 +455,7 @@
             },
             "settings": {
                 "DESKTOP": "gnome",
+                "HDDSIZEGB": "15",
                 "PACKAGE_SET": "default",
                 "POSTINSTALL": "_collect_data"
             }
@@ -519,7 +513,6 @@
             "settings": {
                 "HDDMODEL": "ide-hd",
                 "HDD_1": "disk_full_mbr.img",
-                "HDDSIZEGB": "20",
                 "PARTITIONING": "guided_delete_all"
             }
         },
@@ -531,6 +524,7 @@
             "settings": {
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
+                "HDDSIZEGB": "15",
                 "LANGUAGE": "french",
                 "NO_UEFI_POST": "1",
                 "PACKAGE_SET": "workstation",
@@ -559,6 +553,7 @@
                 "rocky-dvd-iso-x86_64-*-uefi": 41
             },
             "settings": {
+                "HDDSIZEGB": "15",
                 "PARTITIONING": "custom_lvm_ext4",
                 "ROOT_PASSWORD": "weakpassword",
                 "STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2"
@@ -571,6 +566,7 @@
                 "rocky-dvd-iso-x86_64-*-uefi": 31
             },
             "settings": {
+                "HDDSIZEGB": "15",
                 "PARTITIONING": "custom_standard_partition_ext4",
                 "ROOT_PASSWORD": "weakpassword"
             }
@@ -659,6 +655,7 @@
             "settings": {
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
+                "HDDSIZEGB": "15",
                 "PACKAGE_SET": "graphical-server",
                 "POSTINSTALL": "_console_login",
                 "ROOT_PASSWORD": "weakpassword",
@@ -675,6 +672,7 @@
             "settings": {
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
+                "HDDSIZEGB": "15",
                 "PACKAGE_SET": "workstation",
                 "POSTINSTALL": "_console_login",
                 "ROOT_PASSWORD": "weakpassword",
@@ -820,7 +818,6 @@
             },
             "settings": {
                 "HDD_1": "disk_freespace_%PART_TABLE_TYPE%.img",
-                "HDDSIZEGB": "20",
                 "PARTITIONING": "guided_free_space",
                 "ROOT_PASSWORD": "weakpassword"
             }
diff --git a/tests/disk_guided_empty.pm b/tests/disk_guided_empty.pm
index d536b7c4..96cc440c 100644
--- a/tests/disk_guided_empty.pm
+++ b/tests/disk_guided_empty.pm
@@ -18,33 +18,19 @@ sub run {
     if (get_var('TEST_UPDATES')){
         assert_screen "anaconda_install_destination_updates", 30;
     }
-    # Here the self identification test code is placed.
-    my $branched = get_var('VERSION');
-    if ($identification eq 'true' or $branched ne "Rawhide") {
+   # Here the self identification test code is placed.
+   my $branched = get_var('VERSION');
+   if ($identification eq 'true' or $branched ne "Rawhide") {
         check_top_bar(); # See utils.pm
         # we don't check version or pre-release because here those
         # texts appear on the banner which makes the needling
         # complex and fragile (banner is different between variants,
         # and has a gradient so for RTL languages the background color
         # differs; pre-release text is also translated)
-    }
+   }
 
     assert_and_click "anaconda_spoke_done";
 
-    # if we get the "Reclaim Space" dialog, hit enter to reclaim space
-    if (check_screen("anaconda_install_destination_reclaim_space_btn", 5)) {
-        # hit enter to reclaim space
-        send_key "ret";
-
-        # select 'delete all' button and hit enter to delete existing data
-        send_key_until_needlematch("anaconda_install_destination_delete_all_btn_selected", "tab", 5);
-        send_key "ret";
-
-        # send tab 5 times to select "Reclaim Space" button
-        send_key_until_needlematch("anaconda_install_destination_reclaim_space_btn_selected", "tab", 5);
-        send_key "ret";
-    }
-
     # Anaconda hub
     assert_screen "anaconda_main_hub", 300; #