diff --git a/needles/rocky-next_button-20220216.json b/needles/rocky-next_button-20220216.json
new file mode 100644
index 00000000..48dcdf53
--- /dev/null
+++ b/needles/rocky-next_button-20220216.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "width": 55,
+      "type": "match",
+      "height": 25,
+      "ypos": 37,
+      "xpos": 958
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-english",
+    "next_button"
+  ]
+}
\ No newline at end of file
diff --git a/needles/rocky-next_button-20220216.png b/needles/rocky-next_button-20220216.png
new file mode 100644
index 00000000..0b77698c
Binary files /dev/null and b/needles/rocky-next_button-20220216.png differ
diff --git a/templates.fif.json b/templates.fif.json
index b28c85aa..437071e2 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -454,6 +454,8 @@
                 "rocky-dvd-iso-x86_64-*-uefi": 11
             },
             "settings": {
+                "DESKTOP": "gnome",
+                "HDDSIZEGB": "15",
                 "PACKAGE_SET": "default",
                 "POSTINSTALL": "_collect_data"
             }
@@ -616,17 +618,13 @@
         },
         "install_package_set_minimal": {
             "profiles": {
+                "rocky-boot-iso-x86_64-*-64bit": 10,
+                "rocky-boot-iso-x86_64-*-uefi": 11,
+                "rocky-dvd-iso-x86_64-*-64bit": 11,
+                "rocky-dvd-iso-x86_64-*-uefi": 11,
+                "rocky-minimal-iso-x86_64-*-64bit": 10,
                 "rocky-universal-aarch64-*-aarch64": 30,
-                "rocky-universal-x86_64-*-64bit": 30
-            },
-            "settings": {
-                "PACKAGE_SET": "minimal",
-                "POSTINSTALL": "_console_login"
-            }
-        },
-        "install_package_set_minimal": {
-            "profiles": {
-                "rocky-universal-aarch64-*-aarch64": 30,
+                "rocky-universal-x86_64-*-64bit": 30,
                 "rocky-package-set-x86_64-*-64bit": 30
             },
             "settings": {
@@ -636,6 +634,9 @@
         },
         "install_package_set_server": {
             "profiles": {
+                "rocky-dvd-iso-x86_64-*-64bit": 11,
+                "rocky-dvd-iso-x86_64-*-uefi": 11,
+                "rocky-minimal-iso-x86_64-*-64bit": 10,
                 "rocky-universal-aarch64-*-aarch64": 30,
                 "rocky-package-set-x86_64-*-64bit": 30
             },
@@ -646,12 +647,15 @@
         },
         "install_package_set_graphical-server": {
             "profiles": {
+                "rocky-dvd-iso-x86_64-*-64bit": 11,
+                "rocky-dvd-iso-x86_64-*-uefi": 11,
                 "rocky-universal-aarch64-*-aarch64": 30,
                 "rocky-package-set-x86_64-*-64bit": 30
             },
             "settings": {
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
+                "HDDSIZEGB": "15",
                 "PACKAGE_SET": "graphical-server",
                 "POSTINSTALL": "_console_login",
                 "ROOT_PASSWORD": "weakpassword",
@@ -660,12 +664,15 @@
         },
         "install_package_set_workstation": {
             "profiles": {
+                "rocky-dvd-iso-x86_64-*-64bit": 11,
+                "rocky-dvd-iso-x86_64-*-uefi": 11,
                 "rocky-universal-aarch64-*-aarch64": 30,
                 "rocky-package-set-x86_64-*-64bit": 30
             },
             "settings": {
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
+                "HDDSIZEGB": "15",
                 "PACKAGE_SET": "workstation",
                 "POSTINSTALL": "_console_login",
                 "ROOT_PASSWORD": "weakpassword",
@@ -674,6 +681,8 @@
         },
         "install_package_set_virtualization-host": {
             "profiles": {
+                "rocky-dvd-iso-x86_64-*-64bit": 11,
+                "rocky-dvd-iso-x86_64-*-uefi": 11,
                 "rocky-universal-aarch64-*-aarch64": 30,
                 "rocky-package-set-x86_64-*-64bit": 30
             },
diff --git a/tests/_software_selection.pm b/tests/_software_selection.pm
index a307ae34..abb08d88 100644
--- a/tests/_software_selection.pm
+++ b/tests/_software_selection.pm
@@ -7,25 +7,17 @@ sub run {
     # Anaconda hub
     assert_screen "anaconda_main_hub", 300; #
 
-    # Select package set. Minimal is the default, if 'default' is specified, skip selection,
-    # but verify correct default in some cases
-    my $packageset = get_var('PACKAGE_SET', 'minimal');
-    if ($packageset eq 'default' || get_var('MODULAR')) {
-        # we can't or don't want to check the selected package set in these cases
-        return if (get_var('CANNED') || get_var('LIVE') || get_var('MEMCHECK') || (get_var('DISTRI') eq 'Rocky'));
+    # Select package set.
+    # If 'default' is specified, skip selection, but verify correct default
+    my $packageset = get_var('PACKAGE_SET', 'default');
+    if ($packageset eq 'default') {
         $self->root_console;
-        my $env = 'custom-environment';
-        if (get_var('SUBVARIANT') eq 'Server') {
-            $env = 'server-product-environment';
+        my $env = "graphical-server-environment";
+        if (get_var('FLAVOR') eq 'minimal-iso') {
+            $env = "server-product-environment";
         }
-        elsif (get_var('SUBVARIANT') eq 'Workstation') {
-            $env = 'workstation-product-environment';
-        }
-        # pre-F35 line looks like:
-        # 07:51:39,382 INF modules.payloads.payload.dnf.utils: selected environment: custom-environment
-        # F35+ line looks like:
-        # 07:40:26,614 DBG ui.lib.software: Selecting the 'custom-environment' environment.
-        assert_script_run "egrep '(selected env|Selecting the.*environment)' /tmp/anaconda.log /tmp/packaging.log | tail -1 | grep $env";
+
+        assert_script_run "egrep 'selected environment:' /tmp/anaconda.log /tmp/packaging.log | tail -1 | grep $env";
         send_key "ctrl-alt-f6";
         assert_screen "anaconda_main_hub", 30;
         return;
@@ -42,18 +34,12 @@ sub run {
     # In Rocky, graphical-server starts out selected in the DVD ISO so if that's
     # what we're looking for we're done
     if (!check_screen("anaconda_".$packageset."_selected", 1)) {
-      # select desired environment
-      # go through the list 20 times at max (to prevent infinite loop when it's missing)
-      for (my $i = 0; !check_screen("anaconda_".$packageset."_highlighted", 1) && $i < 20; $i++) {
-        send_key "down";
-      }
-
+      send_key_until_needlematch("anaconda_".$packageset."_highlighted", "down", 20);
       send_key "spc";
     }
 
     # check that desired environment is selected
     assert_screen "anaconda_".$packageset."_selected";
-
     assert_and_click "anaconda_spoke_done";
 
     # Anaconda hub