diff --git a/needles/rocky-anaconda_help_keyboard_layout-20230504.json b/needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20230504.json
similarity index 100%
rename from needles/rocky-anaconda_help_keyboard_layout-20230504.json
rename to needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20230504.json
diff --git a/needles/rocky-anaconda_help_keyboard_layout-20230504.png b/needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20230504.png
similarity index 100%
rename from needles/rocky-anaconda_help_keyboard_layout-20230504.png
rename to needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20230504.png
diff --git a/needles/rocky-anaconda_help_language_support-20230504.json b/needles/anaconda/help/rocky-anaconda_help_language_support-20230504.json
similarity index 100%
rename from needles/rocky-anaconda_help_language_support-20230504.json
rename to needles/anaconda/help/rocky-anaconda_help_language_support-20230504.json
diff --git a/needles/rocky-anaconda_help_language_support-20230504.png b/needles/anaconda/help/rocky-anaconda_help_language_support-20230504.png
similarity index 100%
rename from needles/rocky-anaconda_help_language_support-20230504.png
rename to needles/anaconda/help/rocky-anaconda_help_language_support-20230504.png
diff --git a/needles/rocky-anaconda_help_localization_link-20230504.json b/needles/anaconda/help/rocky-anaconda_help_localization_link-20230504.json
similarity index 100%
rename from needles/rocky-anaconda_help_localization_link-20230504.json
rename to needles/anaconda/help/rocky-anaconda_help_localization_link-20230504.json
diff --git a/needles/rocky-anaconda_help_localization_link-20230504.png b/needles/anaconda/help/rocky-anaconda_help_localization_link-20230504.png
similarity index 100%
rename from needles/rocky-anaconda_help_localization_link-20230504.png
rename to needles/anaconda/help/rocky-anaconda_help_localization_link-20230504.png
diff --git a/needles/rocky-anaconda_help_time_date-20230504.json b/needles/anaconda/help/rocky-anaconda_help_time_date-20230504.json
similarity index 100%
rename from needles/rocky-anaconda_help_time_date-20230504.json
rename to needles/anaconda/help/rocky-anaconda_help_time_date-20230504.json
diff --git a/needles/rocky-anaconda_help_time_date-20230504.png b/needles/anaconda/help/rocky-anaconda_help_time_date-20230504.png
similarity index 100%
rename from needles/rocky-anaconda_help_time_date-20230504.png
rename to needles/anaconda/help/rocky-anaconda_help_time_date-20230504.png
diff --git a/needles/rocky-help_language_selection-20230504.json b/needles/anaconda/help/rocky-help_language_selection-20230504.json
similarity index 100%
rename from needles/rocky-help_language_selection-20230504.json
rename to needles/anaconda/help/rocky-help_language_selection-20230504.json
diff --git a/needles/rocky-help_language_selection-20230504.png b/needles/anaconda/help/rocky-help_language_selection-20230504.png
similarity index 100%
rename from needles/rocky-help_language_selection-20230504.png
rename to needles/anaconda/help/rocky-help_language_selection-20230504.png
diff --git a/needles/cockpit/rocky-cockpit_autoupdate_planned_time-20230507.json b/needles/cockpit/rocky-cockpit_autoupdate_planned_time-20230507.json
new file mode 100644
index 00000000..33c4c853
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_autoupdate_planned_time-20230507.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 21,
+      "width": 48,
+      "ypos": 475,
+      "xpos": 521,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "autoupdate_planned_time"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_autoupdate_planned_time-20230507.png b/needles/cockpit/rocky-cockpit_autoupdate_planned_time-20230507.png
new file mode 100644
index 00000000..d7fe6e7b
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_autoupdate_planned_time-20230507.png differ
diff --git a/needles/cockpit/rocky-cockpit_logs-20230507.json b/needles/cockpit/rocky-cockpit_logs-20230507.json
new file mode 100644
index 00000000..5eac40f7
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_logs-20230507.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 14,
+      "ypos": 362,
+      "height": 18,
+      "width": 39
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_logs"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_logs-20230507.png b/needles/cockpit/rocky-cockpit_logs-20230507.png
new file mode 100644
index 00000000..bfe841b3
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_logs-20230507.png differ
diff --git a/needles/cockpit/rocky-cockpit_services_detail-20230507.json b/needles/cockpit/rocky-cockpit_services_detail-20230507.json
new file mode 100644
index 00000000..71b20c7d
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_services_detail-20230507.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 27,
+      "type": "match",
+      "ypos": 15,
+      "height": 16,
+      "width": 64
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_services_detail"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_services_detail-20230507.png b/needles/cockpit/rocky-cockpit_services_detail-20230507.png
new file mode 100644
index 00000000..ec232e44
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_services_detail-20230507.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_all_install-20230507.json b/needles/cockpit/rocky-cockpit_updates_all_install-20230507.json
new file mode 100644
index 00000000..38412a6a
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_all_install-20230507.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 20,
+      "width": 64,
+      "height": 18,
+      "ypos": 713
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_all_install"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_all_install-20230507.png b/needles/cockpit/rocky-cockpit_updates_all_install-20230507.png
new file mode 100644
index 00000000..9672fec2
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_all_install-20230507.png differ