diff --git a/needles/anaconda/install_process/rocky_user_created-20210919.json b/needles/anaconda/install_process/rocky_user_created-20210919.json
new file mode 100644
index 00000000..4915c147
--- /dev/null
+++ b/needles/anaconda/install_process/rocky_user_created-20210919.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 286,
+      "ypos": 592,
+      "width": 105,
+      "height": 13,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_install_user_created"
+  ]
+}
\ No newline at end of file
diff --git a/needles/anaconda/install_process/rocky_user_created-20210919.png b/needles/anaconda/install_process/rocky_user_created-20210919.png
new file mode 100644
index 00000000..35147ba4
Binary files /dev/null and b/needles/anaconda/install_process/rocky_user_created-20210919.png differ
diff --git a/needles/gnome/rocky-apps_menu_button-20210919.json b/needles/gnome/rocky-apps_menu_button-20210919.json
new file mode 100644
index 00000000..f828a779
--- /dev/null
+++ b/needles/gnome/rocky-apps_menu_button-20210919.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "height": 15,
+      "xpos": 30,
+      "type": "match",
+      "ypos": 6,
+      "width": 67
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "apps_menu_button",
+    "apps_menu_button_inactive"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/rocky-apps_menu_button-20210919.png b/needles/gnome/rocky-apps_menu_button-20210919.png
new file mode 100644
index 00000000..28775ea3
Binary files /dev/null and b/needles/gnome/rocky-apps_menu_button-20210919.png differ
diff --git a/needles/gnome/rocky-gdm_initial_setup_licence_accept-20210919.json b/needles/gnome/rocky-gdm_initial_setup_licence_accept-20210919.json
new file mode 100644
index 00000000..5b10dc0b
--- /dev/null
+++ b/needles/gnome/rocky-gdm_initial_setup_licence_accept-20210919.json
@@ -0,0 +1,27 @@
+{
+  "area": [
+    {
+      "xpos": 90,
+      "ypos": 143,
+      "width": 113,
+      "height": 23,
+      "type": "match"
+    },
+    {
+      "xpos": 84,
+      "ypos": 629,
+      "width": 205,
+      "height": 21,
+      "type": "match",
+      "click_point": {
+        "xpos": 10.5,
+        "ypos": 10.5
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "gdm_initial_setup_licence_accept"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/rocky-gdm_initial_setup_licence_accept-20210919.png b/needles/gnome/rocky-gdm_initial_setup_licence_accept-20210919.png
new file mode 100644
index 00000000..8170f04f
Binary files /dev/null and b/needles/gnome/rocky-gdm_initial_setup_licence_accept-20210919.png differ
diff --git a/needles/gnome/rocky-gdm_initial_setup_license-20210918.json b/needles/gnome/rocky-gdm_initial_setup_license-20210918.json
new file mode 100644
index 00000000..7aa5888d
--- /dev/null
+++ b/needles/gnome/rocky-gdm_initial_setup_license-20210918.json
@@ -0,0 +1,24 @@
+{
+  "area": [
+    {
+      "xpos": 164,
+      "ypos": 11,
+      "width": 120,
+      "height": 25,
+      "type": "match"
+    },
+    {
+      "xpos": 487,
+      "ypos": 381,
+      "width": 204,
+      "height": 54,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-gnome",
+    "ENV-DISTRI-rocky",
+    "gdm_initial_setup_license"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/rocky-gdm_initial_setup_license-20210918.png b/needles/gnome/rocky-gdm_initial_setup_license-20210918.png
new file mode 100644
index 00000000..f331a53a
Binary files /dev/null and b/needles/gnome/rocky-gdm_initial_setup_license-20210918.png differ
diff --git a/needles/gnome/rocky-gdm_initial_setup_license_accepted-20210919.json b/needles/gnome/rocky-gdm_initial_setup_license_accepted-20210919.json
new file mode 100644
index 00000000..c8e78b17
--- /dev/null
+++ b/needles/gnome/rocky-gdm_initial_setup_license_accepted-20210919.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 484,
+      "ypos": 394,
+      "width": 213,
+      "height": 73,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "gdm_initial_setup_license_accepted"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/rocky-gdm_initial_setup_license_accepted-20210919.png b/needles/gnome/rocky-gdm_initial_setup_license_accepted-20210919.png
new file mode 100644
index 00000000..e918d158
Binary files /dev/null and b/needles/gnome/rocky-gdm_initial_setup_license_accepted-20210919.png differ
diff --git a/needles/gnome/rocky-gdm_initial_setup_spoke_forward-20210919.json b/needles/gnome/rocky-gdm_initial_setup_spoke_forward-20210919.json
new file mode 100644
index 00000000..4326c27a
--- /dev/null
+++ b/needles/gnome/rocky-gdm_initial_setup_spoke_forward-20210919.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "xpos": 846,
+      "ypos": 728,
+      "width": 162,
+      "height": 21,
+      "type": "match",
+      "click_point": {
+        "xpos": 81,
+        "ypos": 10.5
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "gdm_initial_setup_spoke_forward"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/rocky-gdm_initial_setup_spoke_forward-20210919.png b/needles/gnome/rocky-gdm_initial_setup_spoke_forward-20210919.png
new file mode 100644
index 00000000..e918d158
Binary files /dev/null and b/needles/gnome/rocky-gdm_initial_setup_spoke_forward-20210919.png differ
diff --git a/needles/gnome/rocky-gdm_spoke_done-20210919.json b/needles/gnome/rocky-gdm_spoke_done-20210919.json
new file mode 100644
index 00000000..2aa4c764
--- /dev/null
+++ b/needles/gnome/rocky-gdm_spoke_done-20210919.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 12,
+      "ypos": 32,
+      "width": 52,
+      "height": 24,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "gdm_spoke_done"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/rocky-gdm_spoke_done-20210919.png b/needles/gnome/rocky-gdm_spoke_done-20210919.png
new file mode 100644
index 00000000..04c4cbe4
Binary files /dev/null and b/needles/gnome/rocky-gdm_spoke_done-20210919.png differ
diff --git a/needles/gnome/rocky-getting_started-20210919.json b/needles/gnome/rocky-getting_started-20210919.json
new file mode 100644
index 00000000..8685bdc2
--- /dev/null
+++ b/needles/gnome/rocky-getting_started-20210919.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 452,
+      "ypos": 33,
+      "width": 117,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "getting_started"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/rocky-getting_started-20210919.png b/needles/gnome/rocky-getting_started-20210919.png
new file mode 100644
index 00000000..61ff8da8
Binary files /dev/null and b/needles/gnome/rocky-getting_started-20210919.png differ
diff --git a/needles/gnome/rocky-login_gdm_input-20210919.json b/needles/gnome/rocky-login_gdm_input-20210919.json
new file mode 100644
index 00000000..5a8093ff
--- /dev/null
+++ b/needles/gnome/rocky-login_gdm_input-20210919.json
@@ -0,0 +1,18 @@
+{
+  "area": [
+    {
+      "xpos": 340,
+      "height": 68,
+      "type": "match",
+      "width": 343,
+      "ypos": 343
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "DESKTOP-gnome",
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-english",
+    "graphical_login_input"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/rocky-login_gdm_input-20210919.png b/needles/gnome/rocky-login_gdm_input-20210919.png
new file mode 100644
index 00000000..cfb9111d
Binary files /dev/null and b/needles/gnome/rocky-login_gdm_input-20210919.png differ
diff --git a/needles/gnome/rocky-next_button-20210919.json b/needles/gnome/rocky-next_button-20210919.json
new file mode 100644
index 00000000..05712d39
--- /dev/null
+++ b/needles/gnome/rocky-next_button-20210919.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "xpos": 959,
+      "ypos": 37,
+      "width": 54,
+      "height": 25,
+      "type": "match",
+      "click_point": {
+        "xpos": 27,
+        "ypos": 12.5
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "next_button"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/rocky-next_button-20210919.png b/needles/gnome/rocky-next_button-20210919.png
new file mode 100644
index 00000000..5375d632
Binary files /dev/null and b/needles/gnome/rocky-next_button-20210919.png differ
diff --git a/needles/gnome/rocky-skip_button-20210919.json b/needles/gnome/rocky-skip_button-20210919.json
new file mode 100644
index 00000000..537a29b6
--- /dev/null
+++ b/needles/gnome/rocky-skip_button-20210919.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "xpos": 963,
+      "ypos": 37,
+      "width": 51,
+      "height": 26,
+      "type": "match",
+      "click_point": {
+        "xpos": 25.5,
+        "ypos": 13
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "skip_button"
+  ]
+}
\ No newline at end of file
diff --git a/needles/gnome/rocky-skip_button-20210919.png b/needles/gnome/rocky-skip_button-20210919.png
new file mode 100644
index 00000000..477f2f8e
Binary files /dev/null and b/needles/gnome/rocky-skip_button-20210919.png differ
diff --git a/templates.fif.json b/templates.fif.json
index 4a1a001e..3f6f9ff8 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -62,6 +62,15 @@
             },
             "version": "*"
         },
+        "rocky-package-set-x86_64-*": {
+            "arch": "x86_64",
+            "distri": "rocky",
+            "flavor": "package-set",
+            "settings": {
+                "TEST_TARGET": "ISO"
+            },
+            "version": "*"
+        },
         "rocky-universal-x86_64-*": {
             "arch": "x86_64",
             "distri": "rocky",
@@ -93,6 +102,14 @@
             "machine": "uefi",
             "product": "rocky-dvd-iso-x86_64-*"
         },
+        "rocky-package-set-x86_64-*-64bit": {
+            "machine": "64bit",
+            "product": "rocky-package-set-x86_64-*"
+        },
+        "rocky-package-set-x86_64-*-uefi": {
+            "machine": "64bit",
+            "product": "rocky-package-set-x86_64-*"
+        },
         "rocky-universal-x86_64-*-64bit": {
             "machine": "64bit",
             "product": "rocky-universal-x86_64-*"
@@ -509,25 +526,66 @@
                 "ROOT_PASSWORD": "weakpassword"
             }
         },
-        "install_package_set_kde": {
-            "profiles": {
-                "rocky-universal-x86_64-*-64bit": 50
-            },
-            "settings": {
-                "DESKTOP": "kde",
-                "HDDSIZEGB": "15",
-                "PACKAGE_SET": "kde",
-                "POSTINSTALL": "_collect_data",
-                "REPOSITORY_VARIATION": "%LOCATION%"
-            }
-        },
         "install_package_set_minimal": {
             "profiles": {
                 "rocky-universal-x86_64-*-64bit": 30
             },
             "settings": {
                 "PACKAGE_SET": "minimal",
-                "POSTINSTALL": "_collect_data"
+                "POSTINSTALL": "_console_login"
+            }
+        },
+        "install_package_set_minimal": {
+            "profiles": {
+                "rocky-package-set-x86_64-*-64bit": 30
+            },
+            "settings": {
+                "PACKAGE_SET": "minimal",
+                "POSTINSTALL": "_console_login"
+            }
+        },
+        "install_package_set_server": {
+            "profiles": {
+                "rocky-package-set-x86_64-*-64bit": 30
+            },
+            "settings": {
+                "PACKAGE_SET": "server",
+                "POSTINSTALL": "_console_login"
+            }
+        },
+        "install_package_set_graphical-server": {
+            "profiles": {
+                "rocky-package-set-x86_64-*-64bit": 30
+            },
+            "settings": {
+                "DESKTOP": "gnome",
+                "ENCRYPT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "graphical-server",
+                "POSTINSTALL": "_console_login",
+                "ROOT_PASSWORD": "weakpassword",
+                "USER_LOGIN": "qwerty"
+            }
+        },
+        "install_package_set_workstation": {
+            "profiles": {
+                "rocky-package-set-x86_64-*-64bit": 30
+            },
+            "settings": {
+                "DESKTOP": "gnome",
+                "ENCRYPT_PASSWORD": "weakpassword",
+                "PACKAGE_SET": "workstation",
+                "POSTINSTALL": "_console_login",
+                "ROOT_PASSWORD": "weakpassword",
+                "USER_LOGIN": "qwerty"
+            }
+        },
+        "install_package_set_virtualization-host": {
+            "profiles": {
+                "rocky-package-set-x86_64-*-64bit": 30
+            },
+            "settings": {
+                "PACKAGE_SET": "virtualization-host",
+                "POSTINSTALL": "_console_login"
             }
         },
         "install_pxeboot": {
diff --git a/tests/_software_selection.pm b/tests/_software_selection.pm
index 721c5595..07ec6d5b 100644
--- a/tests/_software_selection.pm
+++ b/tests/_software_selection.pm
@@ -39,13 +39,17 @@ sub run {
     send_key "tab";
     wait_still_screen 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";
-    }
+    # 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 "spc";
+      send_key "spc";
+    }
 
     # check that desired environment is selected
     assert_screen "anaconda_".$packageset."_selected";