diff --git a/lib/anaconda.pm b/lib/anaconda.pm
index 5740d34d..96537903 100644
--- a/lib/anaconda.pm
+++ b/lib/anaconda.pm
@@ -411,6 +411,19 @@ sub check_help_on_pane {
     }
     # Otherwise, only check the relevant screen.
     else {
+        # Rocky help has a level of indirection here. Need to click a link first...
+        if ((get_var('DISTRI') eq "rocky"))
+        {
+            if ($screen eq "keyboard_layout" || $screen eq "language_support" || $screen eq "time_date")
+            {
+                assert_and_click "anaconda_help_localization_link";
+                # Specifically for language_support and time_date press page-down
+                if ($screen eq "language_support" || $screen eq "time_date")
+                {
+                    send_key "spc";
+                }
+            }
+        }
         assert_screen "anaconda_help_$screen";
     }
     # Close Help window
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.json b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.json
new file mode 100644
index 00000000..d140a35d
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 247,
+      "ypos": 554,
+      "width": 35,
+      "height": 30,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_main_hub_create_user"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.png b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.png
new file mode 100644
index 00000000..6c027359
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_create_user-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.json b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.json
new file mode 100644
index 00000000..5da72d93
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 724,
+      "ypos": 202,
+      "width": 32,
+      "height": 30,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_main_hub_install_destination"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.png b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.png
new file mode 100644
index 00000000..b308f450
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_destination-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.json b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.json
new file mode 100644
index 00000000..dd7c9b57
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 486,
+      "ypos": 202,
+      "width": 30,
+      "height": 30,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_main_hub_install_source"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.png b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.png
new file mode 100644
index 00000000..7f0521da
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_install_source-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.json b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.json
new file mode 100644
index 00000000..be9ee041
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 245,
+      "ypos": 202,
+      "width": 37,
+      "height": 29,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_main_hub_keyboard_layout"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.png b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.png
new file mode 100644
index 00000000..13368f83
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_keyboard_layout-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.json b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.json
new file mode 100644
index 00000000..afb73d53
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 247,
+      "ypos": 272,
+      "width": 34,
+      "height": 30,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_main_hub_language_support"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.png b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.png
new file mode 100644
index 00000000..12ea7c3d
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_language_support-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.json b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.json
new file mode 100644
index 00000000..2899beeb
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 722,
+      "ypos": 342,
+      "width": 33,
+      "height": 29,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_main_hub_network_host_name"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.png b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.png
new file mode 100644
index 00000000..6d7e9aa6
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_network_host_name-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.json b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.json
new file mode 100644
index 00000000..b835f102
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 245,
+      "ypos": 484,
+      "width": 36,
+      "height": 33,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_main_hub_root_password"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.png b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.png
new file mode 100644
index 00000000..061e1f1c
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_root_password-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.json b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.json
new file mode 100644
index 00000000..5cc983d3
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 485,
+      "ypos": 274,
+      "width": 33,
+      "height": 31,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_main_hub_software_selection"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.png b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.png
new file mode 100644
index 00000000..e55b95cc
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_software_selection-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.json b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.json
new file mode 100644
index 00000000..e7c7e234
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 244,
+      "ypos": 341,
+      "width": 36,
+      "height": 31,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_main_hub_time_date"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.png b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.png
new file mode 100644
index 00000000..d9fa68ee
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help-anaconda_main_hub_time_date-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_create_user-20220203.json b/needles/anaconda/help/rocky-anaconda_help_create_user-20220203.json
new file mode 100644
index 00000000..4c12c504
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_create_user-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 41,
+      "ypos": 220,
+      "width": 384,
+      "height": 35,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_create_user"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_create_user-20220203.png b/needles/anaconda/help/rocky-anaconda_help_create_user-20220203.png
new file mode 100644
index 00000000..fb3f311f
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_create_user-20220203.png differ
diff --git a/needles/anaconda/help/rocky-help_language_selection-20210811.json b/needles/anaconda/help/rocky-anaconda_help_help_language_selection-20220202.json
similarity index 52%
rename from needles/anaconda/help/rocky-help_language_selection-20210811.json
rename to needles/anaconda/help/rocky-anaconda_help_help_language_selection-20220202.json
index b87a1c23..681dbea3 100644
--- a/needles/anaconda/help/rocky-help_language_selection-20210811.json
+++ b/needles/anaconda/help/rocky-anaconda_help_help_language_selection-20220202.json
@@ -1,11 +1,11 @@
 {
   "area": [
     {
-      "width": 313,
-      "type": "match",
-      "xpos": 547,
-      "ypos": 132,
-      "height": 38
+      "xpos": 41,
+      "ypos": 217,
+      "width": 499,
+      "height": 38,
+      "type": "match"
     }
   ],
   "properties": [],
@@ -13,4 +13,4 @@
     "ENV-DISTRI-rocky",
     "anaconda_help_language_selection"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_help_language_selection-20220202.png b/needles/anaconda/help/rocky-anaconda_help_help_language_selection-20220202.png
new file mode 100644
index 00000000..1a70599c
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_help_language_selection-20220202.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_install_destination-20220203.json b/needles/anaconda/help/rocky-anaconda_help_install_destination-20220203.json
new file mode 100644
index 00000000..e573bc25
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_install_destination-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 41,
+      "ypos": 220,
+      "width": 446,
+      "height": 34,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_install_destination"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_install_destination-20220203.png b/needles/anaconda/help/rocky-anaconda_help_install_destination-20220203.png
new file mode 100644
index 00000000..fdb6b83d
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_install_destination-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_installation_progress-20220203.json b/needles/anaconda/help/rocky-anaconda_help_installation_progress-20220203.json
new file mode 100644
index 00000000..e862fa11
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_installation_progress-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 40,
+      "ypos": 216,
+      "width": 436,
+      "height": 40,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_installation_progress"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_installation_progress-20220203.png b/needles/anaconda/help/rocky-anaconda_help_installation_progress-20220203.png
new file mode 100644
index 00000000..325a8c58
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_installation_progress-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_installation_source-20220203.json b/needles/anaconda/help/rocky-anaconda_help_installation_source-20220203.json
new file mode 100644
index 00000000..fbcc035f
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_installation_source-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 39,
+      "ypos": 217,
+      "width": 490,
+      "height": 39,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_installation_source"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_installation_source-20220203.png b/needles/anaconda/help/rocky-anaconda_help_installation_source-20220203.png
new file mode 100644
index 00000000..fd4b99aa
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_installation_source-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20220203.json b/needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20220203.json
new file mode 100644
index 00000000..858423fa
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 40,
+      "ypos": 217,
+      "width": 340,
+      "height": 39,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_keyboard_layout"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20220203.png b/needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20220203.png
new file mode 100644
index 00000000..8c7743c4
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_keyboard_layout-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_language_support-20220203.json b/needles/anaconda/help/rocky-anaconda_help_language_support-20220203.json
new file mode 100644
index 00000000..41f55f99
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_language_support-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 39,
+      "ypos": 250,
+      "width": 312,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_language_support"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_language_support-20220203.png b/needles/anaconda/help/rocky-anaconda_help_language_support-20220203.png
new file mode 100644
index 00000000..8ca0978f
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_language_support-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_localization_link-20220203.json b/needles/anaconda/help/rocky-anaconda_help_localization_link-20220203.json
new file mode 100644
index 00000000..6db6dd3b
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_localization_link-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 53,
+      "ypos": 396,
+      "width": 400,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_localization_link"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_localization_link-20220203.png b/needles/anaconda/help/rocky-anaconda_help_localization_link-20220203.png
new file mode 100644
index 00000000..d7517d28
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_localization_link-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_network_host_name-20220203.json b/needles/anaconda/help/rocky-anaconda_help_network_host_name-20220203.json
new file mode 100644
index 00000000..72b66dd6
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_network_host_name-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 40,
+      "ypos": 219,
+      "width": 700,
+      "height": 34,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_network_host_name"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_network_host_name-20220203.png b/needles/anaconda/help/rocky-anaconda_help_network_host_name-20220203.png
new file mode 100644
index 00000000..d590b28f
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_network_host_name-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_progress-20220203.json b/needles/anaconda/help/rocky-anaconda_help_progress-20220203.json
new file mode 100644
index 00000000..d3ec02a0
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_progress-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 42,
+      "ypos": 218,
+      "width": 676,
+      "height": 36,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_progress"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_progress-20220203.png b/needles/anaconda/help/rocky-anaconda_help_progress-20220203.png
new file mode 100644
index 00000000..cba07f6f
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_progress-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_progress_link-20220203.json b/needles/anaconda/help/rocky-anaconda_help_progress_link-20220203.json
new file mode 100644
index 00000000..83e12982
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_progress_link-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 54,
+      "ypos": 242,
+      "width": 284,
+      "height": 17,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_progress_link"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_progress_link-20220203.png b/needles/anaconda/help/rocky-anaconda_help_progress_link-20220203.png
new file mode 100644
index 00000000..4ecdb262
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_progress_link-20220203.png differ
diff --git a/needles/anaconda/help/rocky-help_quit-20210811.json b/needles/anaconda/help/rocky-anaconda_help_quit-20220202.json
similarity index 50%
rename from needles/anaconda/help/rocky-help_quit-20210811.json
rename to needles/anaconda/help/rocky-anaconda_help_quit-20220202.json
index 9a358db4..cde07234 100644
--- a/needles/anaconda/help/rocky-help_quit-20210811.json
+++ b/needles/anaconda/help/rocky-anaconda_help_quit-20220202.json
@@ -1,11 +1,11 @@
 {
   "area": [
     {
-      "width": 51,
-      "type": "match",
-      "xpos": 782,
-      "ypos": 15,
-      "height": 15
+      "xpos": 965,
+      "ypos": 76,
+      "width": 18,
+      "height": 24,
+      "type": "match"
     }
   ],
   "properties": [],
@@ -13,4 +13,4 @@
     "ENV-DISTRI-rocky",
     "anaconda_help_quit"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_quit-20220202.png b/needles/anaconda/help/rocky-anaconda_help_quit-20220202.png
new file mode 100644
index 00000000..1a70599c
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_quit-20220202.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_root_password-20220203.json b/needles/anaconda/help/rocky-anaconda_help_root_password-20220203.json
new file mode 100644
index 00000000..ef288757
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_root_password-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 40,
+      "ypos": 219,
+      "width": 454,
+      "height": 35,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_root_password"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_root_password-20220203.png b/needles/anaconda/help/rocky-anaconda_help_root_password-20220203.png
new file mode 100644
index 00000000..437a249f
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_root_password-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_select_packages-20220203.json b/needles/anaconda/help/rocky-anaconda_help_select_packages-20220203.json
new file mode 100644
index 00000000..7bada192
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_select_packages-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 39,
+      "ypos": 219,
+      "width": 488,
+      "height": 36,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_select_packages"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_select_packages-20220203.png b/needles/anaconda/help/rocky-anaconda_help_select_packages-20220203.png
new file mode 100644
index 00000000..7ffc54b5
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_select_packages-20220203.png differ
diff --git a/needles/anaconda/help/rocky-help_summary-20210811.json b/needles/anaconda/help/rocky-anaconda_help_summary-20220203.json
similarity index 50%
rename from needles/anaconda/help/rocky-help_summary-20210811.json
rename to needles/anaconda/help/rocky-anaconda_help_summary-20220203.json
index 0b3b432b..a8befcb8 100644
--- a/needles/anaconda/help/rocky-help_summary-20210811.json
+++ b/needles/anaconda/help/rocky-anaconda_help_summary-20220203.json
@@ -1,11 +1,11 @@
 {
   "area": [
     {
-      "width": 342,
-      "type": "match",
-      "xpos": 674,
-      "ypos": 700,
-      "height": 35
+      "xpos": 41,
+      "ypos": 195,
+      "width": 457,
+      "height": 32,
+      "type": "match"
     }
   ],
   "properties": [],
@@ -13,4 +13,4 @@
     "ENV-DISTRI-rocky",
     "anaconda_help_summary"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_summary-20220203.png b/needles/anaconda/help/rocky-anaconda_help_summary-20220203.png
new file mode 100644
index 00000000..4ecdb262
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_summary-20220203.png differ
diff --git a/needles/anaconda/help/rocky-anaconda_help_time_date-20220203.json b/needles/anaconda/help/rocky-anaconda_help_time_date-20220203.json
new file mode 100644
index 00000000..984c3900
--- /dev/null
+++ b/needles/anaconda/help/rocky-anaconda_help_time_date-20220203.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 40,
+      "ypos": 421,
+      "width": 350,
+      "height": 20,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "anaconda_help_time_date"
+  ]
+}
diff --git a/needles/anaconda/help/rocky-anaconda_help_time_date-20220203.png b/needles/anaconda/help/rocky-anaconda_help_time_date-20220203.png
new file mode 100644
index 00000000..60d43dd8
Binary files /dev/null and b/needles/anaconda/help/rocky-anaconda_help_time_date-20220203.png differ
diff --git a/needles/anaconda/help/rocky-help_language_selection-20210811.png b/needles/anaconda/help/rocky-help_language_selection-20210811.png
deleted file mode 100644
index 0ed8baa2..00000000
Binary files a/needles/anaconda/help/rocky-help_language_selection-20210811.png and /dev/null differ
diff --git a/needles/anaconda/help/rocky-help_quit-20210811.png b/needles/anaconda/help/rocky-help_quit-20210811.png
deleted file mode 100644
index 0ed8baa2..00000000
Binary files a/needles/anaconda/help/rocky-help_quit-20210811.png and /dev/null differ
diff --git a/needles/anaconda/help/rocky-help_summary-20210811.png b/needles/anaconda/help/rocky-help_summary-20210811.png
deleted file mode 100644
index 0346f97f..00000000
Binary files a/needles/anaconda/help/rocky-help_summary-20210811.png and /dev/null differ
diff --git a/needles/anaconda/install_destination/rocky-delete_all_btn-20220126.json b/needles/anaconda/install_destination/rocky-delete_all_btn-20220126.json
deleted file mode 100644
index 418dc2fc..00000000
--- a/needles/anaconda/install_destination/rocky-delete_all_btn-20220126.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "height": 16,
-      "type": "match",
-      "width": 59,
-      "xpos": 942,
-      "ypos": 520
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_install_destination_delete_all_btn"
-  ]
-}
diff --git a/needles/anaconda/install_destination/rocky-delete_all_btn-20220126.png b/needles/anaconda/install_destination/rocky-delete_all_btn-20220126.png
deleted file mode 100644
index 406ceb01..00000000
Binary files a/needles/anaconda/install_destination/rocky-delete_all_btn-20220126.png and /dev/null differ
diff --git a/needles/anaconda/install_destination/rocky-reclaim_space_btn-20220125.json b/needles/anaconda/install_destination/rocky-reclaim_space_btn-20220125.json
deleted file mode 100644
index e3ad934e..00000000
--- a/needles/anaconda/install_destination/rocky-reclaim_space_btn-20220125.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "height": 22,
-      "type": "match",
-      "width": 108,
-      "xpos": 683,
-      "ypos": 544
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_install_destination_reclaim_space_btn"
-  ]
-}
diff --git a/needles/anaconda/install_destination/rocky-reclaim_space_btn-20220125.png b/needles/anaconda/install_destination/rocky-reclaim_space_btn-20220125.png
deleted file mode 100644
index 644baba8..00000000
Binary files a/needles/anaconda/install_destination/rocky-reclaim_space_btn-20220125.png and /dev/null differ
diff --git a/needles/anaconda/install_destination/rocky-reclaim_space_delete_btn-20220125.json b/needles/anaconda/install_destination/rocky-reclaim_space_delete_btn-20220125.json
deleted file mode 100644
index a61d3c93..00000000
--- a/needles/anaconda/install_destination/rocky-reclaim_space_delete_btn-20220125.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "height": 16,
-      "type": "match",
-      "width": 48,
-      "xpos": 106,
-      "ypos": 521
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_install_destination_reclaim_space_delete_btn"
-  ]
-}
diff --git a/needles/anaconda/install_destination/rocky-reclaim_space_delete_btn-20220125.png b/needles/anaconda/install_destination/rocky-reclaim_space_delete_btn-20220125.png
deleted file mode 100644
index ec319a79..00000000
Binary files a/needles/anaconda/install_destination/rocky-reclaim_space_delete_btn-20220125.png and /dev/null differ
diff --git a/needles/anaconda/install_destination/rocky-reclaim_space_first_partition-20220125.json b/needles/anaconda/install_destination/rocky-reclaim_space_first_partition-20220125.json
deleted file mode 100644
index 63c14cd3..00000000
--- a/needles/anaconda/install_destination/rocky-reclaim_space_first_partition-20220125.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "height": 30,
-      "type": "match",
-      "width": 27,
-      "xpos": 148,
-      "ypos": 259
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_install_destination_reclaim_space_first_partition"
-  ]
-}
diff --git a/needles/anaconda/install_destination/rocky-reclaim_space_first_partition-20220125.png b/needles/anaconda/install_destination/rocky-reclaim_space_first_partition-20220125.png
deleted file mode 100644
index 06fe8b6c..00000000
Binary files a/needles/anaconda/install_destination/rocky-reclaim_space_first_partition-20220125.png and /dev/null differ
diff --git a/needles/anaconda/install_destination/rocky-reclaim_space_shrink_btn-20220126.json b/needles/anaconda/install_destination/rocky-reclaim_space_shrink_btn-20220126.json
deleted file mode 100644
index d201710d..00000000
--- a/needles/anaconda/install_destination/rocky-reclaim_space_shrink_btn-20220126.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "height": 22,
-      "type": "match",
-      "width": 61,
-      "xpos": 169,
-      "ypos": 517
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_install_destination_reclaim_space_shrink_btn"
-  ]
-}
diff --git a/needles/anaconda/install_destination/rocky-reclaim_space_shrink_btn-20220126.png b/needles/anaconda/install_destination/rocky-reclaim_space_shrink_btn-20220126.png
deleted file mode 100644
index 067d44c7..00000000
Binary files a/needles/anaconda/install_destination/rocky-reclaim_space_shrink_btn-20220126.png and /dev/null differ
diff --git a/needles/anaconda/install_destination/rocky-reclaim_space_shrink_slider-20220126.json b/needles/anaconda/install_destination/rocky-reclaim_space_shrink_slider-20220126.json
deleted file mode 100644
index f9b89615..00000000
--- a/needles/anaconda/install_destination/rocky-reclaim_space_shrink_slider-20220126.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "area": [
-    {
-      "height": 35,
-      "type": "match",
-      "width": 209,
-      "xpos": 16,
-      "ypos": 487
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "ENV-DISTRI-rocky",
-    "LANGUAGE-english",
-    "anaconda_install_destination_reclaim_space_shrink_slider"
-  ]
-}
diff --git a/needles/anaconda/install_destination/rocky-reclaim_space_shrink_slider-20220126.png b/needles/anaconda/install_destination/rocky-reclaim_space_shrink_slider-20220126.png
deleted file mode 100644
index a516c549..00000000
Binary files a/needles/anaconda/install_destination/rocky-reclaim_space_shrink_slider-20220126.png and /dev/null differ
diff --git a/needles/anaconda/main_hub/rocky-begin_installation-20210807.json b/needles/anaconda/main_hub/rocky-anaconda_main_hub_begin_installation-20220203.json
similarity index 57%
rename from needles/anaconda/main_hub/rocky-begin_installation-20210807.json
rename to needles/anaconda/main_hub/rocky-anaconda_main_hub_begin_installation-20220203.json
index 87b07630..67892e41 100644
--- a/needles/anaconda/main_hub/rocky-begin_installation-20210807.json
+++ b/needles/anaconda/main_hub/rocky-anaconda_main_hub_begin_installation-20220203.json
@@ -1,11 +1,11 @@
 {
   "area": [
     {
-      "width": 107,
-      "ypos": 708,
-      "xpos": 912,
-      "type": "match",
-      "height": 17
+      "xpos": 884,
+      "ypos": 705,
+      "width": 128,
+      "height": 24,
+      "type": "match"
     }
   ],
   "properties": [],
@@ -14,4 +14,4 @@
     "LANGUAGE-english",
     "anaconda_main_hub_begin_installation"
   ]
-}
\ No newline at end of file
+}
diff --git a/needles/anaconda/main_hub/rocky-anaconda_main_hub_begin_installation-20220203.png b/needles/anaconda/main_hub/rocky-anaconda_main_hub_begin_installation-20220203.png
new file mode 100644
index 00000000..c0ada568
Binary files /dev/null and b/needles/anaconda/main_hub/rocky-anaconda_main_hub_begin_installation-20220203.png differ
diff --git a/needles/anaconda/main_hub/rocky-begin_installation-20210807.png b/needles/anaconda/main_hub/rocky-begin_installation-20210807.png
deleted file mode 100644
index 8d17aa97..00000000
Binary files a/needles/anaconda/main_hub/rocky-begin_installation-20210807.png and /dev/null differ
diff --git a/tests/_do_install_and_reboot.pm b/tests/_do_install_and_reboot.pm
index 03105f65..af2d6225 100644
--- a/tests/_do_install_and_reboot.pm
+++ b/tests/_do_install_and_reboot.pm
@@ -112,8 +112,8 @@ sub run {
     # we're on a debug kernel, debug kernel installs are really slow.
     my $timeout = 1800;
     my $version = lc(get_var('VERSION'));
-    if ($version eq "rawhide" || lc(get_var('DISTRI')) eq "rocky") {
-        $timeout = 4800;
+    if ($version eq "rawhide") {
+        $timeout = 2400;
     }
     # workstation especially has an unfortunate habit of kicking in
     # the screensaver during install...
diff --git a/tests/_software_selection.pm b/tests/_software_selection.pm
index 07ec6d5b..a307ae34 100644
--- a/tests/_software_selection.pm
+++ b/tests/_software_selection.pm
@@ -12,7 +12,7 @@ sub run {
     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'));
+        return if (get_var('CANNED') || get_var('LIVE') || get_var('MEMCHECK') || (get_var('DISTRI') eq 'Rocky'));
         $self->root_console;
         my $env = 'custom-environment';
         if (get_var('SUBVARIANT') eq 'Server') {
diff --git a/tests/anaconda_help.pm b/tests/anaconda_help.pm
index 2ca0df74..2243df18 100644
--- a/tests/anaconda_help.pm
+++ b/tests/anaconda_help.pm
@@ -24,8 +24,14 @@ sub run {
 
     # Create test plans
     my @testplan;
+    # For Rocky ISO
+    if ((get_var('DISTRI') eq "Rocky")) {
+        @testplan = qw/keyboard_layout language_support time_date installation_source select_packages install_destination network_host_name root_password create_user/;
+    }
+    # While technically we don't need any of these Fedora test plans it's worth
+    # leaving them here for now as examples.
     # For LIVE KDE:
-    if ((get_var('LIVE')) && (get_var('DESKTOP') eq "kde")) {
+    elsif ((get_var('LIVE')) && (get_var('DESKTOP') eq "kde")) {
         @testplan = qw/keyboard_layout time_date install_destination network_host_name root_password create_user/;
     }
     # For LIVE Workstation
@@ -51,6 +57,11 @@ sub run {
     # need to set a root password or create a user; on other flavors
     # we must
     unless (get_var("DESKTOP") eq "gnome" ) {
+        # In Rocky ISO you will finish testplan on Create User and need to shift-tab to select
+	# Root password
+        if ((get_var("DISTRI") eq "rocky" )) {
+	    send_key_until_needlematch("anaconda_main_hub_root_password", "shift-tab");
+        }
         assert_and_click "anaconda_main_hub_root_password";
         type_safely "weakrootpassword";
         send_key "tab";
@@ -62,7 +73,9 @@ sub run {
     wait_screen_change { assert_and_click "anaconda_main_hub_begin_installation"; };
 
     # Check the last Help screen
-    check_help_on_pane("installation_progress");
+    unless (get_var("DISTRI") eq "rocky") {
+        check_help_on_pane("installation_progress");
+    }
 
     # As there is no need to proceed with the installation,
     # the test ends here and the VM will be destroyed
diff --git a/tests/install_text.pm b/tests/install_text.pm
index f86ba721..26f015d7 100644
--- a/tests/install_text.pm
+++ b/tests/install_text.pm
@@ -141,7 +141,7 @@ sub run {
     # begin installation
     console_type_wait("b\n");
 
-    # When simulated crash is planned, then proceed with the crash routines and finish,
+    # When simulated crash is planned, then proceed with the crash routines and finish, 
     # otherwise proceed normally and do
     if (get_var("CRASH_REPORT")) {
         crash_anaconda_text;
@@ -153,7 +153,7 @@ sub run {
     # we're on a debug kernel, debug kernel installs are really slow.
     my $timeout = 1800;
     if (lc(get_var('VERSION')) eq "rawhide" || lc(get_var('DISTRI')) eq "rocky") {
-        $timeout = 4800;
+        $timeout = 2400;
     }
 
     if (testapi::is_serial_terminal) {