diff --git a/gitops/argocd/charts/monitoring/kube-prometheus-stack/values-k3s-homelab.yaml b/gitops/argocd/charts/monitoring/kube-prometheus-stack/values-k3s-homelab.yaml
index 09f97f9b48..f365b92c17 100644
--- a/gitops/argocd/charts/monitoring/kube-prometheus-stack/values-k3s-homelab.yaml
+++ b/gitops/argocd/charts/monitoring/kube-prometheus-stack/values-k3s-homelab.yaml
@@ -142,16 +142,20 @@ kube-prometheus-stack:
   kubeApiServer:
     serviceMonitor:
       relabelings:
-      # Remove high cardinality metrics
+      - action: replace
+        replacement: portefaix-k3s-homelab
+        targetLabel: cluster
+      metric_relabel_configs:
       - sourceLabels: ["__name__"]
         regex: (apiserver|etcd|rest_client)_request(|_sli|_slo)_duration_seconds_bucket
         action: drop
       - sourceLabels: ["__name__"]
         regex: (apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket)
         action: drop
-      - action: replace
-        replacement: portefaix-k3s-homelab
-        targetLabel: cluster
+      - action: drop
+        regex: "apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket"
+        source_labels:
+        - __name__
 
   kubelet:
     serviceMonitor:
@@ -200,6 +204,11 @@ kube-prometheus-stack:
       - action: replace
         replacement: portefaix-k3s-homelab
         targetLabel: cluster
+      metric_relabel_configs:
+      - action: drop
+        regex: "etcd_request_duration_seconds_bucket"
+        source_labels:
+        - __name__
 
   kubeScheduler:
     endpoints:
@@ -319,16 +328,6 @@ kube-prometheus-stack:
       - action: replace
         replacement: portefaix-k3s-homelab
         targetLabel: cluster
-      # Drop some unused metrics
-      - action: drop
-        regex: "apiserver_request_duration_seconds_bucket|apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket|apiserver_watch_events_sizes_bucket"
-        source_labels:
-        - __name__
-      - action: drop
-        regex: "etcd_request_duration_seconds_bucket"
-        source_labels:
-        - __name__
-
 
     prometheusSpec:
       # externalUrl: https://prometheus.aws.portefaix.xyz