diff --git a/needles/cockpit/rocky-autoupdate_planned_day-20210814.png b/needles/cockpit/rocky-autoupdate_planned_day-20210814.png
deleted file mode 100644
index 6372f962..00000000
Binary files a/needles/cockpit/rocky-autoupdate_planned_day-20210814.png and /dev/null differ
diff --git a/needles/cockpit/rocky-autoupdate_planned_day-20210814.json b/needles/cockpit/rocky-autoupdate_planned_day-20210920.json
similarity index 51%
rename from needles/cockpit/rocky-autoupdate_planned_day-20210814.json
rename to needles/cockpit/rocky-autoupdate_planned_day-20210920.json
index b4b4cdfa..e811dd0a 100644
--- a/needles/cockpit/rocky-autoupdate_planned_day-20210814.json
+++ b/needles/cockpit/rocky-autoupdate_planned_day-20210920.json
@@ -1,11 +1,11 @@
 {
   "area": [
     {
-      "ypos": 341,
-      "width": 71,
-      "xpos": 546,
-      "type": "match",
-      "height": 19
+      "xpos": 429,
+      "ypos": 462,
+      "width": 73,
+      "height": 21,
+      "type": "match"
     }
   ],
   "properties": [],
diff --git a/needles/cockpit/rocky-autoupdate_planned_day-20210920.png b/needles/cockpit/rocky-autoupdate_planned_day-20210920.png
new file mode 100644
index 00000000..9bbd0277
Binary files /dev/null and b/needles/cockpit/rocky-autoupdate_planned_day-20210920.png differ
diff --git a/needles/cockpit/rocky-autoupdate_planned_time-20210920.json b/needles/cockpit/rocky-autoupdate_planned_time-20210920.json
new file mode 100644
index 00000000..5211853c
--- /dev/null
+++ b/needles/cockpit/rocky-autoupdate_planned_time-20210920.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 520,
+      "ypos": 460,
+      "width": 40,
+      "height": 21,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "autoupdate_planned_time"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-autoupdate_planned_time-20210920.png b/needles/cockpit/rocky-autoupdate_planned_time-20210920.png
new file mode 100644
index 00000000..9bbd0277
Binary files /dev/null and b/needles/cockpit/rocky-autoupdate_planned_time-20210920.png differ
diff --git a/needles/cockpit/rocky-cockpit_leftbar_scroll-20210917.json b/needles/cockpit/rocky-cockpit_leftbar_scroll-20210917.json
new file mode 100644
index 00000000..c83dbadf
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_leftbar_scroll-20210917.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "ypos": 694,
+      "width": 43,
+      "height": 55,
+      "xpos": 196,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_leftbar_scroll"
+  ]
+}
diff --git a/needles/cockpit/rocky-cockpit_leftbar_scroll-20210917.png b/needles/cockpit/rocky-cockpit_leftbar_scroll-20210917.png
new file mode 100644
index 00000000..515a5350
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_leftbar_scroll-20210917.png differ
diff --git a/needles/cockpit/rocky-cockpit_main-20210917.json b/needles/cockpit/rocky-cockpit_main-20210917.json
new file mode 100644
index 00000000..9694fa79
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_main-20210917.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "ypos": 604,
+      "width": 213,
+      "height": 27,
+      "xpos": 262,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_main"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_main-20210917.png b/needles/cockpit/rocky-cockpit_main-20210917.png
new file mode 100644
index 00000000..d6296a31
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_main-20210917.png differ
diff --git a/needles/cockpit/rocky-cockpit_save_changes-20210917.json b/needles/cockpit/rocky-cockpit_save_changes-20210917.json
new file mode 100644
index 00000000..63925970
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_save_changes-20210917.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 398,
+      "height": 17,
+      "width": 100,
+      "ypos": 543
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_save_changes"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_save_changes-20210917.png b/needles/cockpit/rocky-cockpit_save_changes-20210917.png
new file mode 100644
index 00000000..0242392a
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_save_changes-20210917.png differ
diff --git a/needles/cockpit/rocky-cockpit_save_changes-20210920.json b/needles/cockpit/rocky-cockpit_save_changes-20210920.json
new file mode 100644
index 00000000..b50ba91b
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_save_changes-20210920.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 17,
+      "xpos": 398,
+      "ypos": 543,
+      "width": 100
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_save_changes"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_save_changes-20210920.png b/needles/cockpit/rocky-cockpit_save_changes-20210920.png
new file mode 100644
index 00000000..77fe2f4b
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_save_changes-20210920.png differ
diff --git a/needles/cockpit/rocky-cockpit_software_updates-20210917.json b/needles/cockpit/rocky-cockpit_software_updates-20210917.json
new file mode 100644
index 00000000..5cf6f666
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_software_updates-20210917.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 84,
+      "height": 22,
+      "ypos": 690,
+      "width": 62
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_software_updates"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_software_updates-20210917.png b/needles/cockpit/rocky-cockpit_software_updates-20210917.png
new file mode 100644
index 00000000..d0fd0842
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_software_updates-20210917.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_all_install-20210917.json b/needles/cockpit/rocky-cockpit_updates_all_install-20210917.json
new file mode 100644
index 00000000..f0dbcc7b
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_all_install-20210917.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "ypos": 388,
+      "width": 65,
+      "height": 18,
+      "xpos": 835,
+      "type": "match"
+    }
+  ],
+  "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-20210917.png b/needles/cockpit/rocky-cockpit_updates_all_install-20210917.png
new file mode 100644
index 00000000..f4055d67
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_all_install-20210917.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_auto-20210916.json b/needles/cockpit/rocky-cockpit_updates_auto-20210916.json
new file mode 100644
index 00000000..cf07ef56
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_auto-20210916.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "height": 21,
+      "width": 37,
+      "ypos": 413,
+      "type": "match",
+      "xpos": 927,
+      "click_point": {
+        "xpos": 18.5,
+        "ypos": 10.5
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_auto"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_auto-20210916.png b/needles/cockpit/rocky-cockpit_updates_auto-20210916.png
new file mode 100644
index 00000000..24ebcb5f
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_auto-20210916.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_auto_all-20210916.json b/needles/cockpit/rocky-cockpit_updates_auto_all-20210916.json
new file mode 100644
index 00000000..edba3412
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_auto_all-20210916.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "ypos": 287,
+      "width": 43,
+      "height": 19,
+      "xpos": 535,
+      "type": "match",
+      "click_point": {
+        "xpos": 11.5,
+        "ypos": 8.5
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_auto_all"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_auto_all-20210916.png b/needles/cockpit/rocky-cockpit_updates_auto_all-20210916.png
new file mode 100644
index 00000000..f6f00a40
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_auto_all-20210916.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_check-20210916.json b/needles/cockpit/rocky-cockpit_updates_check-20210916.json
new file mode 100644
index 00000000..062d95f6
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_check-20210916.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 941,
+      "height": 20,
+      "width": 22,
+      "ypos": 198
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_check"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_check-20210916.png b/needles/cockpit/rocky-cockpit_updates_check-20210916.png
new file mode 100644
index 00000000..9d16043c
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_check-20210916.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_dnf_install-20210916.json b/needles/cockpit/rocky-cockpit_updates_dnf_install-20210916.json
new file mode 100644
index 00000000..b19b0ea3
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_dnf_install-20210916.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "ypos": 302,
+      "width": 49,
+      "height": 17,
+      "xpos": 271,
+      "type": "match",
+      "click_point": {
+        "xpos": 24.5,
+        "ypos": 8.5
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_dnf_install"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_dnf_install-20210916.png b/needles/cockpit/rocky-cockpit_updates_dnf_install-20210916.png
new file mode 100644
index 00000000..0418e11b
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_dnf_install-20210916.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_dnf_install-20210920.json b/needles/cockpit/rocky-cockpit_updates_dnf_install-20210920.json
new file mode 100644
index 00000000..1b757ad7
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_dnf_install-20210920.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 17,
+      "xpos": 271,
+      "type": "match",
+      "ypos": 302,
+      "width": 49
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_dnf_install"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_dnf_install-20210920.png b/needles/cockpit/rocky-cockpit_updates_dnf_install-20210920.png
new file mode 100644
index 00000000..0bcb4d72
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_dnf_install-20210920.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_restart_ignore-20210916.json b/needles/cockpit/rocky-cockpit_updates_restart_ignore-20210916.json
new file mode 100644
index 00000000..99976b39
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_restart_ignore-20210916.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 759,
+      "height": 24,
+      "ypos": 442,
+      "width": 57,
+      "click_point": {
+        "xpos": 28.5,
+        "ypos": 12
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_restart_ignore"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_restart_ignore-20210916.png b/needles/cockpit/rocky-cockpit_updates_restart_ignore-20210916.png
new file mode 100644
index 00000000..bc8b3a1e
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_restart_ignore-20210916.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_security_complete-20210916.json b/needles/cockpit/rocky-cockpit_updates_security_complete-20210916.json
new file mode 100644
index 00000000..b4a24c40
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_security_complete-20210916.json
@@ -0,0 +1,27 @@
+{
+  "area": [
+    {
+      "xpos": 307,
+      "ypos": 636,
+      "width": 297,
+      "height": 23,
+      "type": "match"
+    },
+    {
+      "xpos": 985,
+      "ypos": 173,
+      "width": 37,
+      "height": 66,
+      "type": "match",
+      "click_point": {
+        "xpos": 31.5,
+        "ypos": 50
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_security_complete"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_security_complete-20210916.png b/needles/cockpit/rocky-cockpit_updates_security_complete-20210916.png
new file mode 100644
index 00000000..ed1a3c86
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_security_complete-20210916.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_security_install-20210916.json b/needles/cockpit/rocky-cockpit_updates_security_install-20210916.json
new file mode 100644
index 00000000..985738de
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_security_install-20210916.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "xpos": 632,
+      "type": "match",
+      "width": 178,
+      "ypos": 554,
+      "height": 20,
+      "click_point": {
+        "xpos": 90,
+        "ypos": 11
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_security_install"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_security_install-20210916.png b/needles/cockpit/rocky-cockpit_updates_security_install-20210916.png
new file mode 100644
index 00000000..9d16043c
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_security_install-20210916.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_updated-cockpit-20210917.json b/needles/cockpit/rocky-cockpit_updates_updated-cockpit-20210917.json
new file mode 100644
index 00000000..622fe412
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_updated-cockpit-20210917.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 639,
+      "type": "match",
+      "width": 172,
+      "ypos": 221,
+      "height": 30
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_updated"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_updated-cockpit-20210917.png b/needles/cockpit/rocky-cockpit_updates_updated-cockpit-20210917.png
new file mode 100644
index 00000000..7a986950
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_updated-cockpit-20210917.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_updated-reboot-20210917.json b/needles/cockpit/rocky-cockpit_updates_updated-reboot-20210917.json
new file mode 100644
index 00000000..97ff58b9
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_updated-reboot-20210917.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 19,
+      "ypos": 322,
+      "width": 56,
+      "type": "match",
+      "xpos": 279
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_updated"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_updated-reboot-20210917.png b/needles/cockpit/rocky-cockpit_updates_updated-reboot-20210917.png
new file mode 100644
index 00000000..44b02d73
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_updated-reboot-20210917.png differ
diff --git a/tests/server_cockpit_updates.pm b/tests/server_cockpit_updates.pm
index 243fe61a..58ef522d 100644
--- a/tests/server_cockpit_updates.pm
+++ b/tests/server_cockpit_updates.pm
@@ -26,20 +26,51 @@ sub run {
     # After updates, ignore restart because we do not need
     # restarting the machine to continue. Also, we would have
     # to deal with much more complicated workflow.
-    #
-    if (check_screen('cockpit_updates_security_install',1)) {
-       assert_and_click 'cockpit_updates_security_install';
-       sleep 60; # wait until things are installed
-       assert_and_click 'cockpit_updates_restart_ignore';
-       wait_still_screen 2;
-    }
 
+    # In Rocky it may take quite a while to query for updates
+    # and present the Install Security Updates button.
+    # Provide a bit of extra time to match that screen
+    if (check_screen('cockpit_updates_security_install', 180)) {
+
+      # There may be a large number of security updates to install
+      # so give the system more time to complete those updates.
+      assert_and_click 'cockpit_updates_security_install';
+      my $run = 0;
+      while ($run < 60) {
+
+        # Ignore rebooting the system because we want to finish the test instead.
+        if (check_screen('cockpit_updates_restart_ignore', 1)) {
+            assert_and_click 'cockpit_updates_restart_ignore';
+            last;
+        }
+        else {
+            sleep 60;
+            $run = $run + 1;
+        }
+
+        # move the mouse a bit
+        mouse_set 100, 100;
+        # also click, if we're a VNC client, seems just moving mouse
+        # isn't enough to defeat blanking
+        mouse_click if (get_var("VNC_CLIENT"));
+        mouse_hide;
+      }
+      wait_still_screen 2;
+
+      # Rocky cockpit UI may require a scroll-down event after
+      # updating.
+      if (check_screen('cockpit_updates_security_complete', 180)) {
+       assert_screen ["cockpit_updates_security_complete"], 120;
+        click_lastmatch;
+      }
+
+    }
 
     # Install the rest of the updates, or any updates
     # that have not been previously installed.
     assert_and_click 'cockpit_updates_all_install';
     my $run = 0;
-    while ($run < 40) {
+    while ($run < 60) {
         # When Cockpit packages are also included in the updates
         # the user is forced to reconnect, i.e. to restart the Web Application
         # and relog for further interaction. We will check if reconnection is
@@ -63,6 +94,13 @@ sub run {
             sleep 10;
             $run = $run + 1;
         }
+
+        # move the mouse a bit
+        mouse_set 100, 100;
+        # also click, if we're a VNC client, seems just moving mouse
+        # isn't enough to defeat blanking
+        mouse_click if (get_var("VNC_CLIENT"));
+        mouse_hide;
     }
     # Check that the system is updated
     assert_screen 'cockpit_updates_updated';