diff --git a/kubernetes/apps/monitoring/dashboards/alloy-overview.json b/kubernetes/apps/monitoring/dashboards/alloy-overview.json
index 2ff546e2..ba3b82bb 100644
--- a/kubernetes/apps/monitoring/dashboards/alloy-overview.json
+++ b/kubernetes/apps/monitoring/dashboards/alloy-overview.json
@@ -14,7 +14,7 @@
       "type": "row"
     },
     {
-      "datasource": {"type": "prometheus", "uid": "prometheus-legacy"},
+      "datasource": {"type": "prometheus", "uid": "prometheus"},
       "fieldConfig": {
         "defaults": {
           "color": {"mode": "thresholds"},
@@ -31,7 +31,7 @@
       "type": "stat"
     },
     {
-      "datasource": {"type": "prometheus", "uid": "prometheus-legacy"},
+      "datasource": {"type": "prometheus", "uid": "prometheus"},
       "fieldConfig": {
         "defaults": {
           "color": {"mode": "thresholds"},
@@ -48,7 +48,7 @@
       "type": "stat"
     },
     {
-      "datasource": {"type": "prometheus", "uid": "prometheus-legacy"},
+      "datasource": {"type": "prometheus", "uid": "prometheus"},
       "fieldConfig": {
         "defaults": {
           "color": {"mode": "thresholds"},
@@ -65,7 +65,7 @@
       "type": "stat"
     },
     {
-      "datasource": {"type": "prometheus", "uid": "prometheus-legacy"},
+      "datasource": {"type": "prometheus", "uid": "prometheus"},
       "fieldConfig": {
         "defaults": {
           "color": {"mode": "thresholds"},
@@ -82,7 +82,7 @@
       "type": "stat"
     },
     {
-      "datasource": {"type": "prometheus", "uid": "prometheus-legacy"},
+      "datasource": {"type": "prometheus", "uid": "prometheus"},
       "fieldConfig": {
         "defaults": {
           "color": {"mode": "thresholds"},
@@ -92,16 +92,16 @@
         },
         "overrides": [
           {"matcher": {"id": "byName", "options": "version"}, "properties": [{"id": "custom.width", "value": 100}]},
-          {"matcher": {"id": "byName", "options": "host"}, "properties": [{"id": "custom.width", "value": 250}]}
+          {"matcher": {"id": "byName", "options": "pod"}, "properties": [{"id": "custom.width", "value": 250}]}
         ]
       },
       "gridPos": {"h": 4, "w": 8, "x": 16, "y": 1},
       "id": 5,
       "options": {"showHeader": true, "cellHeight": "sm", "footer": {"show": false}},
-      "targets": [{"expr": "alloy_build_info", "format": "table", "instant": true, "refId": "A"}],
+      "targets": [{"expr": "alloy_build_info * on(pod) group_left(node) max by (pod, node) (kube_pod_info{namespace=\"monitoring\"})", "format": "table", "instant": true, "refId": "A"}],
       "title": "Agent Versions",
       "transformations": [
-        {"id": "organize", "options": {"excludeByName": {"Time": true, "__name__": true, "branch": true, "goarch": true, "goos": true, "goversion": true, "instance": true, "job": true, "revision": true, "Value": true, "datacenter": true, "environment": true}, "renameByName": {}}}
+        {"id": "organize", "options": {"excludeByName": {"Time": true, "__name__": true, "branch": true, "goarch": true, "goos": true, "goversion": true, "instance": true, "job": true, "revision": true, "Value": true, "datacenter": true, "environment": true, "container": true, "endpoint": true, "namespace": true, "service": true, "tags": true}, "indexByName": {"node": 0, "pod": 1, "version": 2}, "renameByName": {}}}
       ],
       "type": "table"
     },
@@ -112,7 +112,7 @@
       "type": "row"
     },
     {
-      "datasource": {"type": "prometheus", "uid": "prometheus-legacy"},
+      "datasource": {"type": "prometheus", "uid": "prometheus"},
       "fieldConfig": {
         "defaults": {
           "color": {"mode": "palette-classic"},
@@ -126,12 +126,12 @@
       "gridPos": {"h": 8, "w": 12, "x": 0, "y": 6},
       "id": 10,
       "options": {"legend": {"calcs": ["mean", "lastNotNull"], "displayMode": "table", "placement": "right", "showLegend": true}, "tooltip": {"mode": "multi", "sort": "desc"}},
-      "targets": [{"expr": "alloy_resources_process_resident_memory_bytes", "legendFormat": "{{host}}", "refId": "A"}],
+      "targets": [{"expr": "alloy_resources_process_resident_memory_bytes * on(pod) group_left(node) max by (pod, node) (kube_pod_info{namespace=\"monitoring\"})", "legendFormat": "{{node}}", "refId": "A"}],
       "title": "Memory Usage (RSS)",
       "type": "timeseries"
     },
     {
-      "datasource": {"type": "prometheus", "uid": "prometheus-legacy"},
+      "datasource": {"type": "prometheus", "uid": "prometheus"},
       "fieldConfig": {
         "defaults": {
           "color": {"mode": "palette-classic"},
@@ -145,7 +145,7 @@
       "gridPos": {"h": 8, "w": 12, "x": 12, "y": 6},
       "id": 11,
       "options": {"legend": {"calcs": ["mean", "lastNotNull"], "displayMode": "table", "placement": "right", "showLegend": true}, "tooltip": {"mode": "multi", "sort": "desc"}},
-      "targets": [{"expr": "rate(alloy_resources_process_cpu_seconds_total[5m])", "legendFormat": "{{host}}", "refId": "A"}],
+      "targets": [{"expr": "rate(alloy_resources_process_cpu_seconds_total[5m]) * on(pod) group_left(node) max by (pod, node) (kube_pod_info{namespace=\"monitoring\"})", "legendFormat": "{{node}}", "refId": "A"}],
       "title": "CPU Usage",
       "type": "timeseries"
     },
@@ -156,7 +156,7 @@
       "type": "row"
     },
     {
-      "datasource": {"type": "prometheus", "uid": "prometheus-legacy"},
+      "datasource": {"type": "prometheus", "uid": "prometheus"},
       "fieldConfig": {
         "defaults": {
           "color": {"mode": "palette-classic"},
@@ -170,12 +170,12 @@
       "gridPos": {"h": 8, "w": 12, "x": 0, "y": 15},
       "id": 20,
       "options": {"legend": {"calcs": ["mean", "max"], "displayMode": "table", "placement": "right", "showLegend": true}, "tooltip": {"mode": "multi", "sort": "desc"}},
-      "targets": [{"expr": "rate(alloy_resources_machine_rx_bytes_total[5m])", "legendFormat": "{{host}} RX", "refId": "A"}],
+      "targets": [{"expr": "rate(alloy_resources_machine_rx_bytes_total[5m]) * on(pod) group_left(node) max by (pod, node) (kube_pod_info{namespace=\"monitoring\"})", "legendFormat": "{{node}} RX", "refId": "A"}],
       "title": "Network RX",
       "type": "timeseries"
     },
     {
-      "datasource": {"type": "prometheus", "uid": "prometheus-legacy"},
+      "datasource": {"type": "prometheus", "uid": "prometheus"},
       "fieldConfig": {
         "defaults": {
           "color": {"mode": "palette-classic"},
@@ -189,7 +189,7 @@
       "gridPos": {"h": 8, "w": 12, "x": 12, "y": 15},
       "id": 21,
       "options": {"legend": {"calcs": ["mean", "max"], "displayMode": "table", "placement": "right", "showLegend": true}, "tooltip": {"mode": "multi", "sort": "desc"}},
-      "targets": [{"expr": "rate(alloy_resources_machine_tx_bytes_total[5m])", "legendFormat": "{{host}} TX", "refId": "A"}],
+      "targets": [{"expr": "rate(alloy_resources_machine_tx_bytes_total[5m]) * on(pod) group_left(node) max by (pod, node) (kube_pod_info{namespace=\"monitoring\"})", "legendFormat": "{{node}} TX", "refId": "A"}],
       "title": "Network TX",
       "type": "timeseries"
     },
@@ -200,7 +200,7 @@
       "type": "row"
     },
     {
-      "datasource": {"type": "prometheus", "uid": "prometheus-legacy"},
+      "datasource": {"type": "prometheus", "uid": "prometheus"},
       "fieldConfig": {
         "defaults": {
           "color": {"mode": "palette-classic"},
@@ -214,12 +214,12 @@
       "gridPos": {"h": 8, "w": 12, "x": 0, "y": 24},
       "id": 30,
       "options": {"legend": {"calcs": ["mean"], "displayMode": "table", "placement": "right", "showLegend": true}, "tooltip": {"mode": "multi", "sort": "desc"}},
-      "targets": [{"expr": "alloy_component_controller_running_components", "legendFormat": "{{host}}", "refId": "A"}],
+      "targets": [{"expr": "sum by (pod) (alloy_component_controller_running_components) * on(pod) group_left(node) max by (pod, node) (kube_pod_info{namespace=\"monitoring\"})", "legendFormat": "{{node}}", "refId": "A"}],
       "title": "Running Components per Host",
       "type": "timeseries"
     },
     {
-      "datasource": {"type": "prometheus", "uid": "prometheus-legacy"},
+      "datasource": {"type": "prometheus", "uid": "prometheus"},
       "fieldConfig": {
         "defaults": {
           "color": {"mode": "palette-classic"},
@@ -233,7 +233,7 @@
       "gridPos": {"h": 8, "w": 12, "x": 12, "y": 24},
       "id": 31,
       "options": {"legend": {"calcs": ["mean", "max"], "displayMode": "table", "placement": "right", "showLegend": true}, "tooltip": {"mode": "multi", "sort": "desc"}},
-      "targets": [{"expr": "histogram_quantile(0.95, rate(alloy_component_evaluation_seconds_bucket[5m]))", "legendFormat": "{{host}}", "refId": "A"}],
+      "targets": [{"expr": "histogram_quantile(0.95, sum by (pod, le) (rate(alloy_component_evaluation_seconds_bucket[5m]))) * on(pod) group_left(node) max by (pod, node) (kube_pod_info{namespace=\"monitoring\"})", "legendFormat": "{{node}}", "refId": "A"}],
       "title": "Component Evaluation Time (p95)",
       "type": "timeseries"
     }