diff --git a/needles/cockpit/rocky-cockpit_updates_auto-20220724.json b/needles/cockpit/rocky-cockpit_updates_auto-20220724.json
new file mode 100644
index 00000000..21a3cbbd
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_auto-20220724.json
@@ -0,0 +1,34 @@
+{
+  "area": [
+    {
+      "width": 53,
+      "height": 22,
+      "click_point": {
+        "xpos": 24.5,
+        "ypos": 11.5
+      },
+      "type": "match",
+      "xpos": 909,
+      "ypos": 447
+    },
+    {
+      "xpos": 262,
+      "ypos": 448,
+      "width": 145,
+      "height": 20,
+      "type": "match"
+    },
+    {
+      "xpos": 408,
+      "ypos": 448,
+      "width": 75,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_auto"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_auto-20220724.png b/needles/cockpit/rocky-cockpit_updates_auto-20220724.png
new file mode 100644
index 00000000..6fdf7ec5
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_auto-20220724.png differ
diff --git a/needles/cockpit/rocky-logs_entry_detail-priority-20220724.json b/needles/cockpit/rocky-logs_entry_detail-priority-20220724.json
new file mode 100644
index 00000000..bfcca1e0
--- /dev/null
+++ b/needles/cockpit/rocky-logs_entry_detail-priority-20220724.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 21,
+      "width": 72,
+      "xpos": 261,
+      "type": "match",
+      "ypos": 700
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_logs_detail"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-logs_entry_detail-priority-20220724.png b/needles/cockpit/rocky-logs_entry_detail-priority-20220724.png
new file mode 100644
index 00000000..778eb191
Binary files /dev/null and b/needles/cockpit/rocky-logs_entry_detail-priority-20220724.png differ
diff --git a/needles/rocky-getting-started-tour_close_button-20220705.json b/needles/gnome/rocky-getting-started-tour_close_button-20220705.json
similarity index 100%
rename from needles/rocky-getting-started-tour_close_button-20220705.json
rename to needles/gnome/rocky-getting-started-tour_close_button-20220705.json
diff --git a/needles/rocky-getting-started-tour_close_button-20220705.png b/needles/gnome/rocky-getting-started-tour_close_button-20220705.png
similarity index 100%
rename from needles/rocky-getting-started-tour_close_button-20220705.png
rename to needles/gnome/rocky-getting-started-tour_close_button-20220705.png
diff --git a/needles/rocky-getting-started-tour_next_button-20220705.json b/needles/gnome/rocky-getting-started-tour_next_button-20220705.json
similarity index 100%
rename from needles/rocky-getting-started-tour_next_button-20220705.json
rename to needles/gnome/rocky-getting-started-tour_next_button-20220705.json
diff --git a/needles/rocky-getting-started-tour_next_button-20220705.png b/needles/gnome/rocky-getting-started-tour_next_button-20220705.png
similarity index 100%
rename from needles/rocky-getting-started-tour_next_button-20220705.png
rename to needles/gnome/rocky-getting-started-tour_next_button-20220705.png
diff --git a/needles/rocky-getting-started-tour_start_button-20220705.json b/needles/gnome/rocky-getting-started-tour_start_button-20220705.json
similarity index 100%
rename from needles/rocky-getting-started-tour_start_button-20220705.json
rename to needles/gnome/rocky-getting-started-tour_start_button-20220705.json
diff --git a/needles/rocky-getting-started-tour_start_button-20220705.png b/needles/gnome/rocky-getting-started-tour_start_button-20220705.png
similarity index 100%
rename from needles/rocky-getting-started-tour_start_button-20220705.png
rename to needles/gnome/rocky-getting-started-tour_start_button-20220705.png
diff --git a/needles/rocky-getting_started_tour-20220705.json b/needles/gnome/rocky-getting_started_tour-20220705.json
similarity index 100%
rename from needles/rocky-getting_started_tour-20220705.json
rename to needles/gnome/rocky-getting_started_tour-20220705.json
diff --git a/needles/rocky-getting_started_tour-20220705.png b/needles/gnome/rocky-getting_started_tour-20220705.png
similarity index 100%
rename from needles/rocky-getting_started_tour-20220705.png
rename to needles/gnome/rocky-getting_started_tour-20220705.png
diff --git a/templates.fif.json b/templates.fif.json
index 161cfec9..626ec815 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -334,8 +334,6 @@
                 "rocky-dvd-iso-x86_64-*-64bit": 40
             },
             "settings": {
-                "DESKTOP": "false",
-                "PACKAGE_SET": "minimal",
                 "PARTITIONING": "custom_resize_lvm",
                 "HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2",
                 "INSTALL": "1",
@@ -395,8 +393,6 @@
                 "rocky-dvd-iso-x86_64-*-uefi": 41
             },
             "settings": {
-                "DESKTOP": "false",
-                "PACKAGE_SET": "minimal",
                 "PARTITIONING": "custom_gui_lvm_ext4",
                 "HDDSIZEGB": "15",
                 "POSTINSTALL": "disk_custom_lvm_ext4_postinstall",
@@ -410,8 +406,6 @@
                 "rocky-dvd-iso-x86_64-*-uefi": 41
             },
             "settings": {
-                "DESKTOP": "false",
-                "PACKAGE_SET": "minimal",
                 "PARTITIONING": "custom_gui_standard_partition_ext4",
                 "ROOT_PASSWORD": "weakpassword"
             }
@@ -577,8 +571,6 @@
                 "rocky-dvd-iso-x86_64-*-uefi": 41
             },
             "settings": {
-                "DESKTOP": "false",
-                "PACKAGE_SET": "minimal",
                 "PARTITIONING": "custom_lvm_ext4",
                 "ROOT_PASSWORD": "weakpassword",
                 "STORE_HDD_1": "disk_%FLAVOR%_%MACHINE%.qcow2"