diff --git a/kubernetes/raspberry/observability/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/raspberry/observability/kube-prometheus-stack/app/helmrelease.yaml
index 71339f684..5dc76feb7 100644
--- a/kubernetes/raspberry/observability/kube-prometheus-stack/app/helmrelease.yaml
+++ b/kubernetes/raspberry/observability/kube-prometheus-stack/app/helmrelease.yaml
@@ -85,8 +85,6 @@ spec:
           - new-service-discovery-manager
           - remote-write-receiver
         enableRemoteWriteReceiver: true
-        externalLabels:
-          cluster: "raspberry"
         retention: 30d
         retentionSize: 64GiB
         nodeSelector:
@@ -98,6 +96,26 @@ spec:
               resources:
                 requests:
                   storage: 64Gi
+    kubeControllerManager:
+      enabled: false
+    kubeScheduler:
+      enabled: false
+    kubeEtcd:
+      enabled: false
+    kubeProxy:
+      enabled: false
+    kubeApiServer:
+      serviceMonitor:
+        relabelings:
+          - sourceLabels: [__address__]
+            targetLabel: cluster
+            replacement: raspberry
+    kubelet:
+      serviceMonitor:
+        relabelings:
+          - sourceLabels: [__address__]
+            targetLabel: cluster
+            replacement: raspberry
     nodeExporter:
       enabled: true
     prometheus-node-exporter:
@@ -112,6 +130,12 @@ spec:
       prometheus:
         monitor:
           enabled: true
+          relabelings:
+            - sourceLabels: [__address__]
+              targetLabel: cluster
+              replacement: raspberry
+            - source_labels: [__metrics_path__]
+              target_label: metrics_path
     grafana:
       enabled: true
       defaultDashboardsTimezone: ${TIMEZONE}
@@ -127,6 +151,13 @@ spec:
         tls:
           - hosts:
               - *host
+      sidecar:
+        dashboards:
+          multicluster:
+            global:
+              enabled: true
+            etcd:
+              enabled: true
       persistence:
         enabled: true
         storageClassName: longhorn
diff --git a/kubernetes/turing/observability/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/turing/observability/kube-prometheus-stack/app/helmrelease.yaml
index de97ec2af..fe88e9c4a 100644
--- a/kubernetes/turing/observability/kube-prometheus-stack/app/helmrelease.yaml
+++ b/kubernetes/turing/observability/kube-prometheus-stack/app/helmrelease.yaml
@@ -6,7 +6,7 @@ metadata:
   name: &app prometheus-agent
   namespace: &namespace observability
 spec:
-  interval: 30m
+  interval: 1h
   timeout: 15m
   chart:
     spec:
@@ -41,6 +41,8 @@ spec:
     prometheus:
       agentMode: true
       prometheusSpec:
+        externalLabels:
+          cluster: "turing"
         scrapeInterval: 30s
         podMonitorSelectorNilUsesHelmValues: false
         serviceMonitorSelectorNilUsesHelmValues: false