diff --git a/needles/anaconda/package_selection/arabic/rocky-graphical-server_selected_arabic-20240526.json b/needles/anaconda/package_selection/arabic/rocky-graphical-server_selected_arabic-20240526.json
new file mode 100644
index 00000000..d07c4990
--- /dev/null
+++ b/needles/anaconda/package_selection/arabic/rocky-graphical-server_selected_arabic-20240526.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "ypos": 124,
+      "height": 35,
+      "type": "match",
+      "width": 411,
+      "xpos": 587
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-arabic",
+    "anaconda_graphical-server_selected"
+  ]
+}
diff --git a/needles/anaconda/package_selection/arabic/rocky-graphical-server_selected_arabic-20240526.png b/needles/anaconda/package_selection/arabic/rocky-graphical-server_selected_arabic-20240526.png
new file mode 100644
index 00000000..705aa3ba
Binary files /dev/null and b/needles/anaconda/package_selection/arabic/rocky-graphical-server_selected_arabic-20240526.png differ
diff --git a/needles/anaconda/package_selection/french/rocky-graphical-server_selected_french-20240526.json b/needles/anaconda/package_selection/french/rocky-graphical-server_selected_french-20240526.json
new file mode 100644
index 00000000..26befffd
--- /dev/null
+++ b/needles/anaconda/package_selection/french/rocky-graphical-server_selected_french-20240526.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "height": 34,
+      "ypos": 126,
+      "xpos": 27,
+      "width": 392,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-french",
+    "anaconda_graphical-server_selected"
+  ]
+}
diff --git a/needles/anaconda/package_selection/french/rocky-graphical-server_selected_french-20240526.png b/needles/anaconda/package_selection/french/rocky-graphical-server_selected_french-20240526.png
new file mode 100644
index 00000000..e5d5571b
Binary files /dev/null and b/needles/anaconda/package_selection/french/rocky-graphical-server_selected_french-20240526.png differ
diff --git a/needles/anaconda/package_selection/japanese/rocky-graphical-server_selected_japanese-20240526.json b/needles/anaconda/package_selection/japanese/rocky-graphical-server_selected_japanese-20240526.json
new file mode 100644
index 00000000..b2d62b55
--- /dev/null
+++ b/needles/anaconda/package_selection/japanese/rocky-graphical-server_selected_japanese-20240526.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "height": 41,
+      "ypos": 136,
+      "type": "match",
+      "xpos": 47,
+      "width": 400
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-japanese",
+    "anaconda_graphical-server_selected"
+  ]
+}
diff --git a/needles/anaconda/package_selection/japanese/rocky-graphical-server_selected_japanese-20240526.png b/needles/anaconda/package_selection/japanese/rocky-graphical-server_selected_japanese-20240526.png
new file mode 100644
index 00000000..9e72913c
Binary files /dev/null and b/needles/anaconda/package_selection/japanese/rocky-graphical-server_selected_japanese-20240526.png differ
diff --git a/needles/anaconda/package_selection/russian/rocky-graphical-server_selected_russian-20240526.json b/needles/anaconda/package_selection/russian/rocky-graphical-server_selected_russian-20240526.json
new file mode 100644
index 00000000..fc2e070f
--- /dev/null
+++ b/needles/anaconda/package_selection/russian/rocky-graphical-server_selected_russian-20240526.json
@@ -0,0 +1,17 @@
+{
+  "area": [
+    {
+      "ypos": 128,
+      "height": 35,
+      "type": "match",
+      "width": 418,
+      "xpos": 28
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "LANGUAGE-russian",
+    "anaconda_graphical-server_selected"
+  ]
+}
diff --git a/needles/anaconda/package_selection/russian/rocky-graphical-server_selected_russian-20240526.png b/needles/anaconda/package_selection/russian/rocky-graphical-server_selected_russian-20240526.png
new file mode 100644
index 00000000..6c641347
Binary files /dev/null and b/needles/anaconda/package_selection/russian/rocky-graphical-server_selected_russian-20240526.png differ
diff --git a/templates.fif.json b/templates.fif.json
index 0a25d0d4..8f83679f 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -653,7 +653,7 @@
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
                 "LANGUAGE": "arabic",
-                "PACKAGE_SET": "workstation",
+                "PACKAGE_SET": "graphical-server",
                 "POSTINSTALL": "_console_login",
                 "QEMU_DISABLE_SNAPSHOTS": "1",
                 "REPOSITORY_VARIATION": "%LOCATION%",
@@ -674,7 +674,7 @@
                 "ENCRYPT_PASSWORD": "weakpassword",
                 "INPUT_METHOD": "1",
                 "LANGUAGE": "japanese",
-                "PACKAGE_SET": "workstation",
+                "PACKAGE_SET": "graphical-server",
                 "POSTINSTALL": "_console_login",
                 "QEMU_DISABLE_SNAPSHOTS": "1",
                 "REPOSITORY_VARIATION": "%LOCATION%",
@@ -758,7 +758,7 @@
                 "DESKTOP": "gnome",
                 "ENCRYPT_PASSWORD": "weakpassword",
                 "LANGUAGE": "russian",
-                "PACKAGE_SET": "workstation",
+                "PACKAGE_SET": "graphical-server",
                 "POSTINSTALL": "_console_login",
                 "QEMU_DISABLE_SNAPSHOTS": "1",
                 "REPOSITORY_VARIATION": "%LOCATION%",
@@ -869,7 +869,7 @@
                 "ENCRYPT_PASSWORD": "weakpassword",
                 "LANGUAGE": "french",
                 "NO_UEFI_POST": "1",
-                "PACKAGE_SET": "workstation",
+                "PACKAGE_SET": "graphical-server",
                 "POSTINSTALL": "_console_login",
                 "QEMU_DISABLE_SNAPSHOTS": "1",
                 "REPOSITORY_VARIATION": "%LOCATION%",