diff --git a/needles/cockpit/cockpit_main-cockpit198.json b/needles/cockpit/cockpit_main-cockpit198.json
new file mode 100644
index 00000000..94f1cec3
--- /dev/null
+++ b/needles/cockpit/cockpit_main-cockpit198.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 173,
+      "height": 15,
+      "width": 59,
+      "xpos": 425,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_main"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/cockpit_main-cockpit198.png b/needles/cockpit/cockpit_main-cockpit198.png
new file mode 100644
index 00000000..c356511f
Binary files /dev/null and b/needles/cockpit/cockpit_main-cockpit198.png differ
diff --git a/needles/cockpit/join_button-cockpit198.json b/needles/cockpit/join_button-cockpit198.json
new file mode 100644
index 00000000..c86dab29
--- /dev/null
+++ b/needles/cockpit/join_button-cockpit198.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 921,
+      "height": 18,
+      "width": 31,
+      "ypos": 477
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_join_button"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/join_button-cockpit198.png b/needles/cockpit/join_button-cockpit198.png
new file mode 100644
index 00000000..fc85eb7f
Binary files /dev/null and b/needles/cockpit/join_button-cockpit198.png differ
diff --git a/needles/cockpit/join_complete-cockpit198.json b/needles/cockpit/join_complete-cockpit198.json
new file mode 100644
index 00000000..9346eb8a
--- /dev/null
+++ b/needles/cockpit/join_complete-cockpit198.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 437,
+      "height": 17,
+      "ypos": 436,
+      "width": 164
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_join_complete"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/join_complete-cockpit198.png b/needles/cockpit/join_complete-cockpit198.png
new file mode 100644
index 00000000..4e69e10b
Binary files /dev/null and b/needles/cockpit/join_complete-cockpit198.png differ
diff --git a/needles/cockpit/join_domain-cockpit198.json b/needles/cockpit/join_domain-cockpit198.json
new file mode 100644
index 00000000..edd397c7
--- /dev/null
+++ b/needles/cockpit/join_domain-cockpit198.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "width": 160,
+      "height": 27,
+      "ypos": 188,
+      "xpos": 381,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_join_domain"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/join_domain-cockpit198.png b/needles/cockpit/join_domain-cockpit198.png
new file mode 100644
index 00000000..ad3d2209
Binary files /dev/null and b/needles/cockpit/join_domain-cockpit198.png differ
diff --git a/needles/cockpit/join_domain_button-link-cockpit198.json b/needles/cockpit/join_domain_button-link-cockpit198.json
new file mode 100644
index 00000000..7b6dfdb1
--- /dev/null
+++ b/needles/cockpit/join_domain_button-link-cockpit198.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 508,
+      "ypos": 438,
+      "height": 15,
+      "width": 94,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_join_domain_button"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/join_domain_button-link-cockpit198.png b/needles/cockpit/join_domain_button-link-cockpit198.png
new file mode 100644
index 00000000..10001d15
Binary files /dev/null and b/needles/cockpit/join_domain_button-link-cockpit198.png differ
diff --git a/needles/cockpit/join_progress-cockpit198.json b/needles/cockpit/join_progress-cockpit198.json
new file mode 100644
index 00000000..229c51e0
--- /dev/null
+++ b/needles/cockpit/join_progress-cockpit198.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 424,
+      "ypos": 477,
+      "height": 14,
+      "width": 152,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_join_progress"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/join_progress-cockpit198.png b/needles/cockpit/join_progress-cockpit198.png
new file mode 100644
index 00000000..fc575868
Binary files /dev/null and b/needles/cockpit/join_progress-cockpit198.png differ
diff --git a/needles/cockpit/logs-cockpit198.json b/needles/cockpit/logs-cockpit198.json
new file mode 100644
index 00000000..0428257b
--- /dev/null
+++ b/needles/cockpit/logs-cockpit198.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 122,
+      "ypos": 266,
+      "height": 18,
+      "width": 39,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_logs"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/logs-cockpit198.png b/needles/cockpit/logs-cockpit198.png
new file mode 100644
index 00000000..b212b2d0
Binary files /dev/null and b/needles/cockpit/logs-cockpit198.png differ
diff --git a/needles/cockpit/services_auditd_detail.json b/needles/cockpit/logs_entry-cockpit198.json
similarity index 50%
rename from needles/cockpit/services_auditd_detail.json
rename to needles/cockpit/logs_entry-cockpit198.json
index 276ef418..e5ed6467 100644
--- a/needles/cockpit/services_auditd_detail.json
+++ b/needles/cockpit/logs_entry-cockpit198.json
@@ -1,15 +1,15 @@
 {
-  "properties": [],
-  "tags": [
-    "cockpit_services_auditd_detail"
-  ],
   "area": [
     {
-      "xpos": 215,
-      "ypos": 325,
-      "width": 319,
+      "width": 43,
       "height": 13,
+      "ypos": 266,
+      "xpos": 859,
       "type": "match"
     }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_logs_entry"
   ]
 }
\ No newline at end of file
diff --git a/needles/cockpit/logs_entry-cockpit198.png b/needles/cockpit/logs_entry-cockpit198.png
new file mode 100644
index 00000000..03536c18
Binary files /dev/null and b/needles/cockpit/logs_entry-cockpit198.png differ
diff --git a/needles/cockpit/logs_entry_detail-cockpit198.json b/needles/cockpit/logs_entry_detail-cockpit198.json
new file mode 100644
index 00000000..7efae637
--- /dev/null
+++ b/needles/cockpit/logs_entry_detail-cockpit198.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "xpos": 473,
+      "height": 14,
+      "ypos": 384,
+      "width": 163
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_logs_detail"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/logs_entry_detail-cockpit198.png b/needles/cockpit/logs_entry_detail-cockpit198.png
new file mode 100644
index 00000000..3c338f1d
Binary files /dev/null and b/needles/cockpit/logs_entry_detail-cockpit198.png differ
diff --git a/needles/cockpit/logs_severity-cockpit198.json b/needles/cockpit/logs_severity-cockpit198.json
new file mode 100644
index 00000000..782a96e4
--- /dev/null
+++ b/needles/cockpit/logs_severity-cockpit198.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 16,
+      "width": 62,
+      "ypos": 160,
+      "xpos": 529
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_logs_severity"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/logs_severity-cockpit198.png b/needles/cockpit/logs_severity-cockpit198.png
new file mode 100644
index 00000000..03536c18
Binary files /dev/null and b/needles/cockpit/logs_severity-cockpit198.png differ
diff --git a/needles/cockpit/services-cockpit198.json b/needles/cockpit/services-cockpit198.json
new file mode 100644
index 00000000..abb8584c
--- /dev/null
+++ b/needles/cockpit/services-cockpit198.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 121,
+      "height": 13,
+      "ypos": 424,
+      "width": 65,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_services"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/services-cockpit198.png b/needles/cockpit/services-cockpit198.png
new file mode 100644
index 00000000..3c338f1d
Binary files /dev/null and b/needles/cockpit/services-cockpit198.png differ
diff --git a/needles/cockpit/services_auditd.json b/needles/cockpit/services_auditd.json
deleted file mode 100644
index 988182e1..00000000
--- a/needles/cockpit/services_auditd.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 580,
-      "ypos": 482,
-      "width": 81,
-      "height": 14,
-      "type": "match"
-    }
-  ],
-  "tags": [
-    "cockpit_services_auditd"
-  ],
-  "properties": []
-}
\ No newline at end of file
diff --git a/needles/cockpit/services_auditd_detail-cockpit186-20190126.json b/needles/cockpit/services_auditd_detail-cockpit186-20190126.json
deleted file mode 100644
index 3e6e7f6f..00000000
--- a/needles/cockpit/services_auditd_detail-cockpit186-20190126.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "ypos": 339,
-      "xpos": 401,
-      "type": "match",
-      "width": 219,
-      "height": 13
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "cockpit_services_auditd_detail"
-  ]
-}
\ No newline at end of file
diff --git a/needles/cockpit/services_auditd_detail.png b/needles/cockpit/services_auditd_detail.png
deleted file mode 100644
index 04c31dca..00000000
Binary files a/needles/cockpit/services_auditd_detail.png and /dev/null differ
diff --git a/needles/cockpit/services_detail-20190126.json b/needles/cockpit/services_detail-20190126.json
new file mode 100644
index 00000000..1175ba08
--- /dev/null
+++ b/needles/cockpit/services_detail-20190126.json
@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 13,
+            "type": "match",
+            "width": 74,
+            "xpos": 276,
+            "ypos": 564
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "cockpit_services_detail"
+    ]
+}
diff --git a/needles/cockpit/services_auditd_detail-cockpit186-20190126.png b/needles/cockpit/services_detail-20190126.png
similarity index 100%
rename from needles/cockpit/services_auditd_detail-cockpit186-20190126.png
rename to needles/cockpit/services_detail-20190126.png
diff --git a/needles/cockpit/services_detail-cockpit198.json b/needles/cockpit/services_detail-cockpit198.json
new file mode 100644
index 00000000..d0113631
--- /dev/null
+++ b/needles/cockpit/services_detail-cockpit198.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "type": "match",
+      "height": 16,
+      "width": 94,
+      "ypos": 650,
+      "xpos": 375
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_services_detail"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/services_detail-cockpit198.png b/needles/cockpit/services_detail-cockpit198.png
new file mode 100644
index 00000000..72570de3
Binary files /dev/null and b/needles/cockpit/services_detail-cockpit198.png differ
diff --git a/needles/cockpit/services_entry-cockpit198.json b/needles/cockpit/services_entry-cockpit198.json
new file mode 100644
index 00000000..c0f7c3c7
--- /dev/null
+++ b/needles/cockpit/services_entry-cockpit198.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 478,
+      "height": 14,
+      "width": 101,
+      "xpos": 745,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_services_entry"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/services_entry-cockpit198.png b/needles/cockpit/services_entry-cockpit198.png
new file mode 100644
index 00000000..78dca7ce
Binary files /dev/null and b/needles/cockpit/services_entry-cockpit198.png differ
diff --git a/needles/cockpit/services_entry.json b/needles/cockpit/services_entry.json
new file mode 100644
index 00000000..436fd3a6
--- /dev/null
+++ b/needles/cockpit/services_entry.json
@@ -0,0 +1,15 @@
+{
+    "area": [
+        {
+            "height": 14,
+            "type": "match",
+            "width": 91,
+            "xpos": 780,
+            "ypos": 482
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "cockpit_services_entry"
+    ]
+}
diff --git a/needles/cockpit/services_auditd.png b/needles/cockpit/services_entry.png
similarity index 100%
rename from needles/cockpit/services_auditd.png
rename to needles/cockpit/services_entry.png
diff --git a/tests/server_cockpit_basic.pm b/tests/server_cockpit_basic.pm
index 359de365..f4a60b7a 100644
--- a/tests/server_cockpit_basic.pm
+++ b/tests/server_cockpit_basic.pm
@@ -21,10 +21,10 @@ sub run {
     # go to the services screen
     assert_and_click "cockpit_services";
     wait_still_screen 2;
-    # assume auditd is there, click it
-    assert_and_click "cockpit_services_auditd";
-    # check we get to the appropriate detail screen
-    assert_screen "cockpit_services_auditd_detail";
+    # click on an entry
+    assert_and_click "cockpit_services_entry";
+    # check we get to a detail screen
+    assert_screen "cockpit_services_detail";
 }
 
 sub test_flags {