diff --git a/observability/grafana/provisioning/dashboards/archon-services.json b/observability/grafana/provisioning/dashboards/archon-services.json
index 3f971c33..ee39a644 100644
--- a/observability/grafana/provisioning/dashboards/archon-services.json
+++ b/observability/grafana/provisioning/dashboards/archon-services.json
@@ -75,8 +75,9 @@
       "pluginVersion": "10.0.0",
       "targets": [
         {
-          "expr": "up{job=\"gatekeeper\"}",
-          "legendFormat": "v${gk_version} (${gk_commit})",
+          "expr": "up{job=\"gatekeeper\"} * on(job, instance) group_left(version, commit) service_version_info{job=\"gatekeeper\"}",
+          "instant": true,
+          "legendFormat": "v{{version}} ({{commit}})",
           "refId": "A"
         }
       ],
@@ -149,8 +150,9 @@
       "pluginVersion": "10.0.0",
       "targets": [
         {
-          "expr": "up{job=\"keymaster\"}",
-          "legendFormat": "v${km_version} (${km_commit})",
+          "expr": "up{job=\"keymaster\"} * on(job, instance) group_left(version, commit) service_version_info{job=\"keymaster\"}",
+          "instant": true,
+          "legendFormat": "v{{version}} ({{commit}})",
           "refId": "A"
         }
       ],
@@ -1490,84 +1492,7 @@
     "observability"
   ],
   "templating": {
-    "list": [
-      {
-        "name": "gk_version",
-        "label": "gk_version",
-        "type": "query",
-        "query": "label_values(service_version_info{job=\"gatekeeper\"}, version)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      },
-      {
-        "name": "gk_commit",
-        "label": "gk_commit",
-        "type": "query",
-        "query": "label_values(service_version_info{job=\"gatekeeper\"}, commit)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      },
-      {
-        "name": "km_version",
-        "label": "km_version",
-        "type": "query",
-        "query": "label_values(service_version_info{job=\"keymaster\"}, version)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      },
-      {
-        "name": "km_commit",
-        "label": "km_commit",
-        "type": "query",
-        "query": "label_values(service_version_info{job=\"keymaster\"}, commit)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      }
-    ]
+    "list": []
   },
   "time": {
     "from": "now-1h",
diff --git a/observability/grafana/provisioning/dashboards/hyperswarm-mediator.json b/observability/grafana/provisioning/dashboards/hyperswarm-mediator.json
index 4ed90fa9..d75bd1e7 100644
--- a/observability/grafana/provisioning/dashboards/hyperswarm-mediator.json
+++ b/observability/grafana/provisioning/dashboards/hyperswarm-mediator.json
@@ -75,8 +75,9 @@
       "pluginVersion": "10.0.0",
       "targets": [
         {
-          "expr": "up{job=\"hyperswarm-mediator\"}",
-          "legendFormat": "v${svc_version} (${svc_commit})",
+          "expr": "up{job=\"hyperswarm-mediator\"} * on(job, instance) group_left(version, commit) service_version_info{job=\"hyperswarm-mediator\"}",
+          "instant": true,
+          "legendFormat": "v{{version}} ({{commit}})",
           "refId": "A"
         }
       ],
@@ -888,46 +889,7 @@
     "hyperswarm"
   ],
   "templating": {
-    "list": [
-      {
-        "name": "svc_version",
-        "label": "svc_version",
-        "type": "query",
-        "query": "label_values(service_version_info{job=\"hyperswarm-mediator\"}, version)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      },
-      {
-        "name": "svc_commit",
-        "label": "svc_commit",
-        "type": "query",
-        "query": "label_values(service_version_info{job=\"hyperswarm-mediator\"}, commit)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      }
-    ]
+    "list": []
   },
   "time": {
     "from": "now-1h",
diff --git a/observability/grafana/provisioning/dashboards/satoshi-mediator-mainnet.json b/observability/grafana/provisioning/dashboards/satoshi-mediator-mainnet.json
index ed033080..98fdbc02 100644
--- a/observability/grafana/provisioning/dashboards/satoshi-mediator-mainnet.json
+++ b/observability/grafana/provisioning/dashboards/satoshi-mediator-mainnet.json
@@ -75,8 +75,9 @@
       "pluginVersion": "10.0.0",
       "targets": [
         {
-          "expr": "up{job=\"btc-mainnet-mediator\"}",
-          "legendFormat": "v${svc_version} (${svc_commit})",
+          "expr": "up{job=\"btc-mainnet-mediator\"} * on(job, instance) group_left(version, commit) service_version_info{job=\"btc-mainnet-mediator\"}",
+          "instant": true,
+          "legendFormat": "v{{version}} ({{commit}})",
           "refId": "A"
         }
       ],
@@ -924,7 +925,7 @@
       "gridPos": { "h": 4, "w": 6, "x": 0, "y": 29 },
       "id": 21,
       "options": { "colorMode": "value", "graphMode": "none", "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false }, "textMode": "value_and_name" },
-      "targets": [{ "expr": "wallet_setup_status{job=\"btc-mainnet-wallet\"}", "legendFormat": "v${wallet_version} (${wallet_commit})", "refId": "A" }],
+      "targets": [{ "expr": "wallet_setup_status{job=\"btc-mainnet-wallet\"} * on(job, instance) group_left(version, commit) wallet_version_info{job=\"btc-mainnet-wallet\"}", "instant": true, "legendFormat": "v{{version}} ({{commit}})", "refId": "A" }],
       "title": "Wallet Status",
       "type": "stat"
     },
@@ -1073,78 +1074,7 @@
     "btc-mainnet"
   ],
   "templating": {
-    "list": [
-      {
-        "name": "svc_version",
-        "label": "svc_version",
-        "type": "query",
-        "query": "label_values(service_version_info{job=\"btc-mainnet-mediator\"}, version)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      },
-      {
-        "name": "svc_commit",
-        "label": "svc_commit",
-        "type": "query",
-        "query": "label_values(service_version_info{job=\"btc-mainnet-mediator\"}, commit)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      },
-      {
-        "name": "wallet_version",
-        "label": "wallet_version",
-        "type": "query",
-        "query": "label_values(wallet_version_info{job=\"btc-mainnet-wallet\"}, version)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": { "text": "", "value": "" },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      },
-      {
-        "name": "wallet_commit",
-        "label": "wallet_commit",
-        "type": "query",
-        "query": "label_values(wallet_version_info{job=\"btc-mainnet-wallet\"}, commit)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": { "text": "", "value": "" },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      }
-    ]
+    "list": []
   },
   "time": {
     "from": "now-1h",
diff --git a/observability/grafana/provisioning/dashboards/satoshi-mediator-signet.json b/observability/grafana/provisioning/dashboards/satoshi-mediator-signet.json
index 59eae857..b8fbe09e 100644
--- a/observability/grafana/provisioning/dashboards/satoshi-mediator-signet.json
+++ b/observability/grafana/provisioning/dashboards/satoshi-mediator-signet.json
@@ -75,8 +75,9 @@
       "pluginVersion": "10.0.0",
       "targets": [
         {
-          "expr": "up{job=\"btc-signet-mediator\"}",
-          "legendFormat": "v${svc_version} (${svc_commit})",
+          "expr": "up{job=\"btc-signet-mediator\"} * on(job, instance) group_left(version, commit) service_version_info{job=\"btc-signet-mediator\"}",
+          "instant": true,
+          "legendFormat": "v{{version}} ({{commit}})",
           "refId": "A"
         }
       ],
@@ -924,7 +925,7 @@
       "gridPos": { "h": 4, "w": 6, "x": 0, "y": 29 },
       "id": 21,
       "options": { "colorMode": "value", "graphMode": "none", "reduceOptions": { "calcs": ["lastNotNull"], "fields": "", "values": false }, "textMode": "value_and_name" },
-      "targets": [{ "expr": "wallet_setup_status{job=\"btc-signet-wallet\"}", "legendFormat": "v${wallet_version} (${wallet_commit})", "refId": "A" }],
+      "targets": [{ "expr": "wallet_setup_status{job=\"btc-signet-wallet\"} * on(job, instance) group_left(version, commit) wallet_version_info{job=\"btc-signet-wallet\"}", "instant": true, "legendFormat": "v{{version}} ({{commit}})", "refId": "A" }],
       "title": "Wallet Status",
       "type": "stat"
     },
@@ -1073,78 +1074,7 @@
     "btc-signet"
   ],
   "templating": {
-    "list": [
-      {
-        "name": "svc_version",
-        "label": "svc_version",
-        "type": "query",
-        "query": "label_values(service_version_info{job=\"btc-signet-mediator\"}, version)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      },
-      {
-        "name": "svc_commit",
-        "label": "svc_commit",
-        "type": "query",
-        "query": "label_values(service_version_info{job=\"btc-signet-mediator\"}, commit)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": {
-          "text": "",
-          "value": ""
-        },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      },
-      {
-        "name": "wallet_version",
-        "label": "wallet_version",
-        "type": "query",
-        "query": "label_values(wallet_version_info{job=\"btc-signet-wallet\"}, version)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": { "text": "", "value": "" },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      },
-      {
-        "name": "wallet_commit",
-        "label": "wallet_commit",
-        "type": "query",
-        "query": "label_values(wallet_version_info{job=\"btc-signet-wallet\"}, commit)",
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "refresh": 1,
-        "hide": 2,
-        "current": { "text": "", "value": "" },
-        "sort": 0,
-        "multi": false,
-        "includeAll": false
-      }
-    ]
+    "list": []
   },
   "time": {
     "from": "now-1h",