diff --git a/observability/ansible/roles/svc-grafana/files/dashboards/boards/logs.json b/observability/ansible/roles/svc-grafana/files/dashboards/boards/logs.json
index be7fff2..6acf627 100644
--- a/observability/ansible/roles/svc-grafana/files/dashboards/boards/logs.json
+++ b/observability/ansible/roles/svc-grafana/files/dashboards/boards/logs.json
@@ -3,7 +3,7 @@
   "title": "Logs",
   "description": "Container (docker) and systemd journal logs from Loki.",
   "schemaVersion": 41,
-  "version": 1,
+  "version": 2,
   "editable": true,
   "refresh": "30s",
   "time": { "from": "now-1h", "to": "now" },
@@ -14,7 +14,7 @@
         "label": "Host",
         "type": "query",
         "datasource": { "type": "loki", "uid": "loki" },
-        "query": { "refId": "var", "query": "label_values(host)" },
+        "query": "label_values(host)",
         "includeAll": true,
         "allValue": ".+",
         "multi": true,
@@ -26,7 +26,7 @@
         "label": "Container",
         "type": "query",
         "datasource": { "type": "loki", "uid": "loki" },
-        "query": { "refId": "var", "query": "label_values(container)" },
+        "query": "label_values(container)",
         "includeAll": true,
         "allValue": ".+",
         "multi": true,
@@ -38,7 +38,7 @@
         "label": "Journal unit",
         "type": "query",
         "datasource": { "type": "loki", "uid": "loki" },
-        "query": { "refId": "var", "query": "label_values(unit)" },
+        "query": "label_values(unit)",
         "includeAll": true,
         "allValue": ".+",
         "multi": true,
@@ -82,11 +82,11 @@
       "title": "Container logs",
       "datasource": { "type": "loki", "uid": "loki" },
       "gridPos": { "h": 12, "w": 24, "x": 0, "y": 7 },
-      "options": { "sortOrder": "Descending", "showTime": true, "wrapLogMessage": true },
+      "options": { "sortOrder": "Descending", "showTime": true, "showLabels": true, "wrapLogMessage": true },
       "targets": [
         {
           "refId": "A",
-          "expr": "{host=~\"$host\", container=~\"$container\"}"
+          "expr": "{host=~\"$host\", container=~\"$container\"} | drop job, service_name"
         }
       ]
     },
@@ -96,11 +96,11 @@
       "title": "Journal (systemd units)",
       "datasource": { "type": "loki", "uid": "loki" },
       "gridPos": { "h": 12, "w": 24, "x": 0, "y": 19 },
-      "options": { "sortOrder": "Descending", "showTime": true, "wrapLogMessage": true },
+      "options": { "sortOrder": "Descending", "showTime": true, "showLabels": true, "wrapLogMessage": true },
       "targets": [
         {
           "refId": "A",
-          "expr": "{host=~\"$host\", unit=~\"$unit\"}"
+          "expr": "{host=~\"$host\", unit=~\"$unit\"} | drop job, service_name"
         }
       ]
     }