diff --git a/needles/cockpit/autoupdate_planned_time-oldcantarell-20200124.json b/needles/cockpit/autoupdate_planned_time-oldcantarell-20200124.json
new file mode 100644
index 00000000..7d2cbf14
--- /dev/null
+++ b/needles/cockpit/autoupdate_planned_time-oldcantarell-20200124.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 18,
+      "type": "match",
+      "width": 50,
+      "ypos": 327,
+      "xpos": 730
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "autoupdate_planned_time"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/autoupdate_planned_time-oldcantarell-20200124.png b/needles/cockpit/autoupdate_planned_time-oldcantarell-20200124.png
new file mode 100644
index 00000000..630fbcaf
Binary files /dev/null and b/needles/cockpit/autoupdate_planned_time-oldcantarell-20200124.png differ
diff --git a/needles/cockpit/cockpit_updates_all_install-oldcantarell-20200124.json b/needles/cockpit/cockpit_updates_all_install-oldcantarell-20200124.json
new file mode 100644
index 00000000..8960b16d
--- /dev/null
+++ b/needles/cockpit/cockpit_updates_all_install-oldcantarell-20200124.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "ypos": 360,
+      "width": 67,
+      "type": "match",
+      "height": 18,
+      "xpos": 857
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_updates_all_install"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/cockpit_updates_all_install-oldcantarell-20200124.png b/needles/cockpit/cockpit_updates_all_install-oldcantarell-20200124.png
new file mode 100644
index 00000000..c9c6e136
Binary files /dev/null and b/needles/cockpit/cockpit_updates_all_install-oldcantarell-20200124.png differ
diff --git a/needles/cockpit/cockpit_updates_auto_on-f31-20200124.json b/needles/cockpit/cockpit_updates_auto_on-f31-20200124.json
new file mode 100644
index 00000000..8e9b19f7
--- /dev/null
+++ b/needles/cockpit/cockpit_updates_auto_on-f31-20200124.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 566,
+      "width": 29,
+      "ypos": 273,
+      "height": 14,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_updates_auto_on"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/cockpit_updates_auto_on-f31-20200124.png b/needles/cockpit/cockpit_updates_auto_on-f31-20200124.png
new file mode 100644
index 00000000..9a59c8ee
Binary files /dev/null and b/needles/cockpit/cockpit_updates_auto_on-f31-20200124.png differ
diff --git a/needles/cockpit/cockpit_updates_check-oldcantarell-20200124.json b/needles/cockpit/cockpit_updates_check-oldcantarell-20200124.json
new file mode 100644
index 00000000..ad49c6d3
--- /dev/null
+++ b/needles/cockpit/cockpit_updates_check-oldcantarell-20200124.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 22,
+      "type": "match",
+      "ypos": 187,
+      "width": 142,
+      "xpos": 847
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_updates_check"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/cockpit_updates_check-oldcantarell-20200124.png b/needles/cockpit/cockpit_updates_check-oldcantarell-20200124.png
new file mode 100644
index 00000000..db0c485d
Binary files /dev/null and b/needles/cockpit/cockpit_updates_check-oldcantarell-20200124.png differ
diff --git a/needles/cockpit/cockpit_updates_dnf_install-20190911.json b/needles/cockpit/cockpit_updates_dnf_install-20190911.json
index cba7c192..b9923500 100644
--- a/needles/cockpit/cockpit_updates_dnf_install-20190911.json
+++ b/needles/cockpit/cockpit_updates_dnf_install-20190911.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 909,
-      "height": 17,
-      "ypos": 554,
-      "type": "match",
-      "width": 43
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "cockpit_updates_dnf_install"
-  ]
+{
+    "area": [
+        {
+            "height": 17,
+            "type": "match",
+            "width": 49,
+            "xpos": 909,
+            "ypos": 554
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "cockpit_updates_dnf_install"
+    ]
 }
\ No newline at end of file
diff --git a/needles/cockpit/cockpit_updates_dnf_install-20191129.json b/needles/cockpit/cockpit_updates_dnf_install-20191129.json
index 5e508436..dbb028f9 100644
--- a/needles/cockpit/cockpit_updates_dnf_install-20191129.json
+++ b/needles/cockpit/cockpit_updates_dnf_install-20191129.json
@@ -1,15 +1,15 @@
-{
-  "area": [
-    {
-      "xpos": 900,
-      "height": 17,
-      "ypos": 326,
-      "width": 43,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "cockpit_updates_dnf_install"
-  ]
+{
+    "area": [
+        {
+            "height": 17,
+            "type": "match",
+            "width": 49,
+            "xpos": 900,
+            "ypos": 326
+        }
+    ],
+    "properties": [],
+    "tags": [
+        "cockpit_updates_dnf_install"
+    ]
 }
\ No newline at end of file
diff --git a/needles/cockpit/cockpit_updates_restart_ignore-oldcantarell-20200124.json b/needles/cockpit/cockpit_updates_restart_ignore-oldcantarell-20200124.json
new file mode 100644
index 00000000..bad05f57
--- /dev/null
+++ b/needles/cockpit/cockpit_updates_restart_ignore-oldcantarell-20200124.json
@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "height": 19,
+      "type": "match",
+      "ypos": 301,
+      "width": 51,
+      "xpos": 562
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "cockpit_updates_restart_ignore"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/cockpit_updates_restart_ignore-oldcantarell-20200124.png b/needles/cockpit/cockpit_updates_restart_ignore-oldcantarell-20200124.png
new file mode 100644
index 00000000..17e9e201
Binary files /dev/null and b/needles/cockpit/cockpit_updates_restart_ignore-oldcantarell-20200124.png differ
diff --git a/templates-updates.fif.json b/templates-updates.fif.json
index bad160a7..ca250eca 100644
--- a/templates-updates.fif.json
+++ b/templates-updates.fif.json
@@ -321,6 +321,13 @@
                 "fedora-updates-server-x86_64-*-64bit": 40
             }
         },
+        "server_cockpit_updates": {
+            "profiles": {
+                "fedora-updates-server-aarch64-*-aarch64": 40,
+                "fedora-updates-server-ppc64le-*-ppc64le": 40,
+                "fedora-updates-server-x86_64-*-64bit": 40
+            }
+        },
         "server_database_client": {
             "profiles": {
                 "fedora-updates-server-aarch64-*-aarch64": 40,
@@ -350,6 +357,20 @@
                 "fedora-updates-server-x86_64-*-64bit": 40
             }
         },
+        "server_remote_logging_client": {
+            "profiles": {
+                "fedora-updates-server-aarch64-*-aarch64": 40,
+                "fedora-updates-server-ppc64le-*-ppc64le": 40,
+                "fedora-updates-server-x86_64-*-64bit": 40
+            }
+        },
+        "server_remote_logging_server": {
+            "profiles": {
+                "fedora-updates-server-aarch64-*-aarch64": 40,
+                "fedora-updates-server-ppc64le-*-ppc64le": 40,
+                "fedora-updates-server-x86_64-*-64bit": 40
+            }
+        },
         "server_role_deploy_database_server": {
             "profiles": {
                 "fedora-updates-server-aarch64-*-aarch64": 40,