diff --git a/k8s-peterg/alloy/configmap.yaml b/k8s-peterg/alloy/configmap.yaml
index 10affc4..69da2ab 100644
--- a/k8s-peterg/alloy/configmap.yaml
+++ b/k8s-peterg/alloy/configmap.yaml
@@ -5,7 +5,7 @@ metadata:
   name: alloy-config
 data:
   config.alloy: |-
-    prometheus.exporter.unix "node" {
+    prometheus.exporter.unix "node_exporter" {
     }
 
     discovery.kubernetes "kubernetes_apiservers" {
@@ -48,16 +48,6 @@ data:
       role = "pod"
     }
 
-    prometheus.relabel "node_exporter" {
-      targets = prometheus.exporter.unix.node.targets
-
-      rule {
-        action       = "replace"
-        target_label = "node"
-        replacement  = env("NODE_NAME")
-      }
-    }
-
     discovery.relabel "kubernetes_apiservers" {
       targets = discovery.kubernetes.kubernetes_apiservers.targets
 
@@ -471,6 +461,16 @@ data:
       path_targets = discovery.relabel.pod_logs.output
     }
 
+    prometheus.relabel "node_exporter" {
+      forward_to = [prometheus.remote_write.default.receiver]
+
+      rule {
+        action       = "replace"
+        target_label = "node"
+        replacement  = env("HOSTNAME")
+      }
+    }
+
     prometheus.scrape "prometheus" {
       targets = [{
         __address__ = "localhost:9090",
@@ -479,12 +479,6 @@ data:
       job_name   = "prometheus"
     }
 
-    prometheus.scrape "node_exporter" {
-      targets    = prometheus.relabel.node_exporter
-      forward_to = [prometheus.remote_write.default.receiver]
-      job_name   = "node-exporter"
-    }
-
     prometheus.scrape "kubernetes_apiservers" {
       targets    = discovery.relabel.kubernetes_apiservers.output
       forward_to = [prometheus.remote_write.default.receiver]