diff --git a/monitoring/base/alloy/kube-scraper/helm-values.yaml b/monitoring/base/alloy/kube-scraper/helm-values.yaml
index dd4ba4b..8f4cb78 100644
--- a/monitoring/base/alloy/kube-scraper/helm-values.yaml
+++ b/monitoring/base/alloy/kube-scraper/helm-values.yaml
@@ -1,7 +1,5 @@
 controller:
   type: 'deployment'
-  nodeSelector:
-    kubernetes.io/hostname: casa-minion-01
 alloy:
 
   # https://grafana.com/docs/alloy/latest/collect/logs-in-kubernetes/
@@ -14,14 +12,15 @@ alloy:
 
     - name: CLUSTER_NAME
       valueFrom:
-      secretKeyRef:
-        name: alloy-global
-        key: cluster_name
+        secretKeyRef:
+          name: alloy-global
+          key: cluster_name
 
     - name: ZONE
-      secretKeyRef:
-        name: alloy-global
-        key: zone
+      valueFrom:
+        secretKeyRef:
+          name: alloy-global
+          key: zone
 
     - name: LOKI_URL
       valueFrom:
diff --git a/monitoring/base/alloy/node-scraper/helm-values.yaml b/monitoring/base/alloy/node-scraper/helm-values.yaml
index e13c9ca..c6bbf58 100644
--- a/monitoring/base/alloy/node-scraper/helm-values.yaml
+++ b/monitoring/base/alloy/node-scraper/helm-values.yaml
@@ -61,30 +61,26 @@ alloy:
     name: alloy-node-scraper 
     key: config.alloy
   extraEnv:
-    - name: NODE_IP
-      valueFrom:
-        fieldRef:
-          fieldPath: status.hostIP
+
     - name: CLUSTER_NAME
-      value: casa
-    - name: JOB
-      value: node-exporter
-    - name: CONTAINER
-      value: node-exporter
-    - name: NS
-      value: monitoring
-    - name: POD
-      value: alloy-node-scraper
-    - name: SERVICE
-      value: alloy-node-scraper
+      valueFrom:
+        secretKeyRef:
+          name: alloy-global
+          key: cluster_name
+
     - name: ZONE
-      value: casa-vlan
+      valueFrom:
+        secretKeyRef:
+          name: alloy-global
+          key: zone
+
     - name: LOKI_URL
       valueFrom:
         secretKeyRef:
           name: alloy-global
           key: loki_url
     - name: PROMETHEUS_URL
+    
       valueFrom:
         secretKeyRef:
           name: alloy-global