diff --git a/lib/cockpit.pm b/lib/cockpit.pm
index 33be0586..3fe933a6 100644
--- a/lib/cockpit.pm
+++ b/lib/cockpit.pm
@@ -39,7 +39,9 @@ sub start_cockpit {
 
 sub select_cockpit_update {
     # This method navigates to to the updates screen
-    assert_and_click "cockpit_software_updates", '', 120;
+    assert_screen ["cockpit_software_updates", "cockpit_leftbar_scroll"], 120;
+    click_lastmatch;
+    assert_and_click "cockpit_software_updates" if (match_has_tag "cockpit_leftbar_scroll");
     # wait for the updates to download
     assert_screen 'cockpit_updates_check', 300;
 }
diff --git a/needles/cockpit/autoupdate_planned_day-20200530.json b/needles/cockpit/autoupdate_planned_day-20200530.json
new file mode 100644
index 00000000..5862210d
--- /dev/null
+++ b/needles/cockpit/autoupdate_planned_day-20200530.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 507,
+      "ypos": 360,
+      "height": 19,
+      "width": 71,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "autoupdate_planned_day"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/autoupdate_planned_day-20200530.png b/needles/cockpit/autoupdate_planned_day-20200530.png
new file mode 100644
index 00000000..5a8d2329
Binary files /dev/null and b/needles/cockpit/autoupdate_planned_day-20200530.png differ
diff --git a/needles/cockpit/autoupdate_planned_time-20200530.json b/needles/cockpit/autoupdate_planned_time-20200530.json
new file mode 100644
index 00000000..8a127722
--- /dev/null
+++ b/needles/cockpit/autoupdate_planned_time-20200530.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 704,
+      "type": "match",
+      "height": 18,
+      "width": 50,
+      "ypos": 359
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "autoupdate_planned_time"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/autoupdate_planned_time-20200530.png b/needles/cockpit/autoupdate_planned_time-20200530.png
new file mode 100644
index 00000000..5a8d2329
Binary files /dev/null and b/needles/cockpit/autoupdate_planned_time-20200530.png differ
diff --git a/needles/cockpit/cockpit_leftbar_scroll-20200530.json b/needles/cockpit/cockpit_leftbar_scroll-20200530.json
new file mode 100644
index 00000000..15758b3f
--- /dev/null
+++ b/needles/cockpit/cockpit_leftbar_scroll-20200530.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "xpos": 270,
+      "type": "match",
+      "height": 15,
+      "ypos": 744,
+      "width": 73
+    },
+    {
+      "xpos": 196,
+      "ypos": 711,
+      "width": 43,
+      "height": 55,
+      "type": "match"
+    }
+  ],
+  "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
new file mode 100644
index 00000000..8e16a589
Binary files /dev/null and b/needles/cockpit/cockpit_leftbar_scroll-20200530.png differ
diff --git a/needles/cockpit/cockpit_updates_all_install-20200530.json b/needles/cockpit/cockpit_updates_all_install-20200530.json
new file mode 100644
index 00000000..69f46723
--- /dev/null
+++ b/needles/cockpit/cockpit_updates_all_install-20200530.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 818,
+      "ypos": 391,
+      "height": 18,
+      "width": 67,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_updates_all_install"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/cockpit_updates_all_install-20200530.png b/needles/cockpit/cockpit_updates_all_install-20200530.png
new file mode 100644
index 00000000..dbdb605d
Binary files /dev/null and b/needles/cockpit/cockpit_updates_all_install-20200530.png differ
diff --git a/needles/cockpit/join_complete-20200530.json b/needles/cockpit/join_complete-20200530.json
new file mode 100644
index 00000000..89040c00
--- /dev/null
+++ b/needles/cockpit/join_complete-20200530.json
@@ -0,0 +1,22 @@
+{
+  "area": [
+    {
+      "xpos": 741,
+      "type": "match",
+      "width": 151,
+      "height": 18,
+      "ypos": 568
+    },
+    {
+      "type": "match",
+      "height": 13,
+      "width": 48,
+      "ypos": 570,
+      "xpos": 655
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_join_complete"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/join_complete-20200530.png b/needles/cockpit/join_complete-20200530.png
new file mode 100644
index 00000000..1af8d3b2
Binary files /dev/null and b/needles/cockpit/join_complete-20200530.png differ
diff --git a/needles/cockpit/logs_entry_detail-20200530.json b/needles/cockpit/logs_entry_detail-20200530.json
new file mode 100644
index 00000000..5aba7abe
--- /dev/null
+++ b/needles/cockpit/logs_entry_detail-20200530.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 14,
+      "width": 163,
+      "ypos": 416,
+      "xpos": 388
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_logs_detail"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/logs_entry_detail-20200530.png b/needles/cockpit/logs_entry_detail-20200530.png
new file mode 100644
index 00000000..335fff1c
Binary files /dev/null and b/needles/cockpit/logs_entry_detail-20200530.png differ
diff --git a/needles/cockpit/services_entry-20200530.json b/needles/cockpit/services_entry-20200530.json
new file mode 100644
index 00000000..e185ec7d
--- /dev/null
+++ b/needles/cockpit/services_entry-20200530.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 455,
+      "height": 17,
+      "width": 76,
+      "type": "match",
+      "xpos": 269
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_services_entry"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/services_entry-20200530.png b/needles/cockpit/services_entry-20200530.png
new file mode 100644
index 00000000..f1946ae7
Binary files /dev/null and b/needles/cockpit/services_entry-20200530.png differ