diff --git a/shell.nix b/shell.nix
index 45c739e8..434826f5 100644
--- a/shell.nix
+++ b/shell.nix
@@ -38,6 +38,6 @@ pkgs.mkShellNoCC {
     kubelogin-oidc
   ];
 
-  ARGOCD_ENV_CLUSTER_NAME = "ekman";
+  ARGOCD_ENV_CLUSTER_NAME = "oceanbox";
   HELM_GIT_ACCESS_TOKEN = "glpat-xxx";
 }
diff --git a/values/prometheus/env-oceanbox.yaml.gotmpl b/values/prometheus/env-oceanbox.yaml.gotmpl
index a43691e6..6998c12a 100644
--- a/values/prometheus/env-oceanbox.yaml.gotmpl
+++ b/values/prometheus/env-oceanbox.yaml.gotmpl
@@ -18,3 +18,70 @@ prometheus:
   kubelet:
     enabled: true
     https: true
+  additionalScrapeConfigs:
+  - job_name: dapr-sidecars
+    kubernetes_sd_configs:
+      - role: pod
+    relabel_configs:
+      - action: keep
+        regex: "true"
+        source_labels:
+          - __meta_kubernetes_pod_annotation_dapr_io_enabled
+      - action: keep
+        regex: "true"
+        source_labels:
+          - __meta_kubernetes_pod_annotation_dapr_io_enable_metrics
+      - action: replace
+        replacement: ${1}
+        source_labels:
+          - __meta_kubernetes_namespace
+        target_label: namespace
+      - action: replace
+        replacement: ${1}
+        source_labels:
+          - __meta_kubernetes_pod_name
+        target_label: pod
+      - action: replace
+        regex: (.*);daprd
+        replacement: ${1}-dapr
+        source_labels:
+          - __meta_kubernetes_pod_annotation_dapr_io_app_id
+          - __meta_kubernetes_pod_container_name
+        target_label: service
+      - action: replace
+        replacement: ${1}:9090
+        source_labels:
+          - __meta_kubernetes_pod_ip
+        target_label: __address__
+  - job_name: dapr
+    kubernetes_sd_configs:
+      - role: pod
+    relabel_configs:
+      - action: keep
+        regex: dapr
+        source_labels:
+          - __meta_kubernetes_pod_label_app_kubernetes_io_name
+      - action: keep
+        regex: dapr
+        source_labels:
+          - __meta_kubernetes_pod_label_app_kubernetes_io_part_of
+      - action: replace
+        replacement: ${1}
+        source_labels:
+          - __meta_kubernetes_pod_label_app
+        target_label: app
+      - action: replace
+        replacement: ${1}
+        source_labels:
+          - __meta_kubernetes_namespace
+        target_label: namespace
+      - action: replace
+        replacement: ${1}
+        source_labels:
+          - __meta_kubernetes_pod_name
+        target_label: pod
+      - action: replace
+        replacement: ${1}:9090
+        source_labels:
+          - __meta_kubernetes_pod_ip
+        target_label: __address__  
\ No newline at end of file
diff --git a/values/prometheus/env.yaml.gotmpl b/values/prometheus/env.yaml.gotmpl
index 56539954..78b0ad7b 100644
--- a/values/prometheus/env.yaml.gotmpl
+++ b/values/prometheus/env.yaml.gotmpl
@@ -10,73 +10,7 @@ prometheus:
   fullname: ""
   # https://github.com/prometheus-community/helm-charts/blob/main/charts/kube-prometheus-stack/values.yaml#L47
   defaultRules: {}
-  additionalScrapeConfigs:
-  - job_name: dapr-sidecars
-    kubernetes_sd_configs:
-      - role: pod
-    relabel_configs:
-      - action: keep
-        regex: "true"
-        source_labels:
-          - __meta_kubernetes_pod_annotation_dapr_io_enabled
-      - action: keep
-        regex: "true"
-        source_labels:
-          - __meta_kubernetes_pod_annotation_dapr_io_enable_metrics
-      - action: replace
-        replacement: ${1}
-        source_labels:
-          - __meta_kubernetes_namespace
-        target_label: namespace
-      - action: replace
-        replacement: ${1}
-        source_labels:
-          - __meta_kubernetes_pod_name
-        target_label: pod
-      - action: replace
-        regex: (.*);daprd
-        replacement: ${1}-dapr
-        source_labels:
-          - __meta_kubernetes_pod_annotation_dapr_io_app_id
-          - __meta_kubernetes_pod_container_name
-        target_label: service
-      - action: replace
-        replacement: ${1}:9090
-        source_labels:
-          - __meta_kubernetes_pod_ip
-        target_label: __address__
-  - job_name: dapr
-    kubernetes_sd_configs:
-      - role: pod
-    relabel_configs:
-      - action: keep
-        regex: dapr
-        source_labels:
-          - __meta_kubernetes_pod_label_app_kubernetes_io_name
-      - action: keep
-        regex: dapr
-        source_labels:
-          - __meta_kubernetes_pod_label_app_kubernetes_io_part_of
-      - action: replace
-        replacement: ${1}
-        source_labels:
-          - __meta_kubernetes_pod_label_app
-        target_label: app
-      - action: replace
-        replacement: ${1}
-        source_labels:
-          - __meta_kubernetes_namespace
-        target_label: namespace
-      - action: replace
-        replacement: ${1}
-        source_labels:
-          - __meta_kubernetes_pod_name
-        target_label: pod
-      - action: replace
-        replacement: ${1}:9090
-        source_labels:
-          - __meta_kubernetes_pod_ip
-        target_label: __address__  
+  additionalScrapeConfigs: []
   additionalDataSources: []
   enableFeatures: []
   #alert_receiver: oncall