diff --git a/lib/cockpit.pm b/lib/cockpit.pm
index 3fe933a6..9e4bf4a6 100644
--- a/lib/cockpit.pm
+++ b/lib/cockpit.pm
@@ -39,9 +39,16 @@ sub start_cockpit {
 
 sub select_cockpit_update {
     # This method navigates to to the updates screen
-    assert_screen ["cockpit_software_updates", "cockpit_leftbar_scroll"], 120;
+    # From Firefox 100 on, we get 'adaptive scrollbars', which means
+    # the scrollbar is just invisible unless you moved the mouse
+    # recently. So we click in the search box and hit 'down' to scroll
+    # the sidebar as often as needed to show the button
+    assert_screen ["cockpit_software_updates", "cockpit_search"], 120;
     click_lastmatch;
-    assert_and_click "cockpit_software_updates" if (match_has_tag "cockpit_leftbar_scroll");
+    if (match_has_tag "cockpit_search") {
+        send_key_until_needlematch("cockpit_software_updates", "down", 10);
+        assert_and_click "cockpit_software_updates";
+    }
     # wait for the updates to download
     assert_screen 'cockpit_updates_check', 300;
 }
diff --git a/needles/anaconda/universal/rocky-accept_fate-20210805.png b/needles/anaconda/universal/rocky-accept_fate-20210805.png
deleted file mode 100644
index 98ff7ee9..00000000
Binary files a/needles/anaconda/universal/rocky-accept_fate-20210805.png and /dev/null differ
diff --git a/needles/anaconda/universal/rocky-accept_fate-20210805.json b/needles/anaconda/universal/rocky-accept_fate-20221006.json
similarity index 64%
rename from needles/anaconda/universal/rocky-accept_fate-20210805.json
rename to needles/anaconda/universal/rocky-accept_fate-20221006.json
index 97b7f3f9..85376107 100644
--- a/needles/anaconda/universal/rocky-accept_fate-20210805.json
+++ b/needles/anaconda/universal/rocky-accept_fate-20221006.json
@@ -1,11 +1,11 @@
 {
   "area": [
     {
-      "ypos": 705,
-      "height": 19,
-      "xpos": 674,
       "type": "match",
-      "width": 343
+      "ypos": 594,
+      "xpos": 647,
+      "width": 124,
+      "height": 19
     }
   ],
   "properties": [],
@@ -14,4 +14,4 @@
     "LANGUAGE-english",
     "anaconda_rawhide_accept_fate"
   ]
-}
+}
\ No newline at end of file
diff --git a/needles/anaconda/universal/rocky-accept_fate-20221006.png b/needles/anaconda/universal/rocky-accept_fate-20221006.png
new file mode 100644
index 00000000..306fd5ae
Binary files /dev/null and b/needles/anaconda/universal/rocky-accept_fate-20221006.png differ
diff --git a/needles/cockpit/cockpit_leftbar_scroll-20200530.json b/needles/cockpit/cockpit_leftbar_scroll-20200530.json
deleted file mode 100644
index 7a51ea98..00000000
--- a/needles/cockpit/cockpit_leftbar_scroll-20200530.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "area": [
-        {
-            "height": 55,
-            "type": "match",
-            "width": 43,
-            "xpos": 196,
-            "ypos": 711
-        }
-    ],
-    "properties": [],
-    "tags": [
-        "cockpit_leftbar_scroll"
-    ]
-}
\ No newline at end of file
diff --git a/needles/cockpit/cockpit_leftbar_scroll-20200530.png b/needles/cockpit/cockpit_leftbar_scroll-20200530.png
deleted file mode 100644
index 8e16a589..00000000
Binary files a/needles/cockpit/cockpit_leftbar_scroll-20200530.png and /dev/null differ
diff --git a/needles/cockpit/cockpit_updates_auto-enable-20210429.json b/needles/cockpit/cockpit_updates_auto-enable-20210429.json
deleted file mode 100644
index 2835c7bc..00000000
--- a/needles/cockpit/cockpit_updates_auto-enable-20210429.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "width": 48,
-      "xpos": 922,
-      "type": "match",
-      "ypos": 508,
-      "height": 19
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "cockpit_updates_auto"
-  ]
-}
\ No newline at end of file
diff --git a/needles/cockpit/cockpit_updates_auto-enable-20210429.png b/needles/cockpit/cockpit_updates_auto-enable-20210429.png
deleted file mode 100644
index 19d109fb..00000000
Binary files a/needles/cockpit/cockpit_updates_auto-enable-20210429.png and /dev/null differ
diff --git a/needles/cockpit/rocky-cockpit_leftbar_scroll-20210917.json b/needles/cockpit/rocky-cockpit_leftbar_scroll-20210917.json
deleted file mode 100644
index c83dbadf..00000000
--- a/needles/cockpit/rocky-cockpit_leftbar_scroll-20210917.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "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
deleted file mode 100644
index 515a5350..00000000
Binary files a/needles/cockpit/rocky-cockpit_leftbar_scroll-20210917.png and /dev/null differ
diff --git a/needles/cockpit/rocky-cockpit_login-20221006.json b/needles/cockpit/rocky-cockpit_login-20221006.json
new file mode 100644
index 00000000..b25f84fa
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_login-20221006.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 77,
+      "width": 232,
+      "ypos": 200,
+      "xpos": 572,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_login"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_login-20221006.png b/needles/cockpit/rocky-cockpit_login-20221006.png
new file mode 100644
index 00000000..2b10e75a
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_login-20221006.png differ
diff --git a/needles/cockpit/rocky-cockpit_login-previous_tabs-20221006.json b/needles/cockpit/rocky-cockpit_login-previous_tabs-20221006.json
new file mode 100644
index 00000000..f6ad3e63
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_login-previous_tabs-20221006.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "ypos": 221,
+      "xpos": 572,
+      "type": "match",
+      "height": 77,
+      "width": 232
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_login"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_login-previous_tabs-20221006.png b/needles/cockpit/rocky-cockpit_login-previous_tabs-20221006.png
new file mode 100644
index 00000000..2b8ff38f
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_login-previous_tabs-20221006.png differ
diff --git a/needles/cockpit/rocky-cockpit_search-20221006.json b/needles/cockpit/rocky-cockpit_search-20221006.json
new file mode 100644
index 00000000..374b755e
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_search-20221006.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 21,
+      "ypos": 207,
+      "width": 174,
+      "height": 27,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_search"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_search-20221006.png b/needles/cockpit/rocky-cockpit_search-20221006.png
new file mode 100644
index 00000000..ccbdd4f5
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_search-20221006.png differ
diff --git a/needles/cockpit/rocky-cockpit_software_updates-20221008.json b/needles/cockpit/rocky-cockpit_software_updates-20221008.json
new file mode 100644
index 00000000..e8d5ec71
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_software_updates-20221008.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 22,
+      "width": 62,
+      "ypos": 689,
+      "xpos": 83,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_software_updates"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_software_updates-20221008.png b/needles/cockpit/rocky-cockpit_software_updates-20221008.png
new file mode 100644
index 00000000..3104886d
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_software_updates-20221008.png differ
diff --git a/needles/cockpit/rocky-cockpit_updates_auto-20220724.json b/needles/cockpit/rocky-cockpit_updates_auto-20220724.json
deleted file mode 100644
index 21a3cbbd..00000000
--- a/needles/cockpit/rocky-cockpit_updates_auto-20220724.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "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
deleted file mode 100644
index 6fdf7ec5..00000000
Binary files a/needles/cockpit/rocky-cockpit_updates_auto-20220724.png and /dev/null differ
diff --git a/needles/cockpit/rocky-cockpit_updates_auto-20221008.json b/needles/cockpit/rocky-cockpit_updates_auto-20221008.json
new file mode 100644
index 00000000..99350022
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_updates_auto-20221008.json
@@ -0,0 +1,20 @@
+{
+  "area": [
+    {
+      "xpos": 264,
+      "ypos": 447,
+      "width": 716,
+      "height": 21,
+      "type": "match",
+      "click_point": {
+        "xpos": 681,
+        "ypos": 11.5
+      }
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_updates_auto"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-cockpit_updates_auto-20221008.png b/needles/cockpit/rocky-cockpit_updates_auto-20221008.png
new file mode 100644
index 00000000..28ed7720
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_updates_auto-20221008.png differ
diff --git a/needles/firefox/rocky-firefox_close_tabs-20221006.json b/needles/firefox/rocky-firefox_close_tabs-20221006.json
new file mode 100644
index 00000000..359846e5
--- /dev/null
+++ b/needles/firefox/rocky-firefox_close_tabs-20221006.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "width": 110,
+      "height": 23,
+      "type": "match",
+      "xpos": 607,
+      "ypos": 196
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "firefox_close_tabs"
+  ]
+}
\ No newline at end of file
diff --git a/needles/firefox/rocky-firefox_close_tabs-20221006.png b/needles/firefox/rocky-firefox_close_tabs-20221006.png
new file mode 100644
index 00000000..bccb98b6
Binary files /dev/null and b/needles/firefox/rocky-firefox_close_tabs-20221006.png differ