diff --git a/k8s-peterg/alloy/configmap.yaml b/k8s-peterg/alloy/configmap.yaml
index 773c2e6..762699d 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_exporter" {
+    prometheus.exporter.unix "node" {
     }
 
     discovery.kubernetes "kubernetes_apiservers" {
@@ -461,21 +461,6 @@ data:
       path_targets = discovery.relabel.pod_logs.output
     }
 
-    prometheus.relabel "node_exporter" {
-      forward_to = [prometheus.scrape.node_exporter]
-      rule {
-        action       = "replace"
-        target_label = "node"
-        replacement  = env("HOSTNAME")
-      }
-    }
-
-    prometheus.scrape "node_exporter" {
-      targets = [prometheus.relabel.node_exporter]
-      forward_to = [prometheus.remote_write.default.receiver]
-      job_name   = "node_exporter"
-    }
-
     prometheus.scrape "prometheus" {
       targets = [{
         __address__ = "localhost:9090",
@@ -484,6 +469,12 @@ data:
       job_name   = "prometheus"
     }
 
+    prometheus.scrape "node_exporter" {
+      targets    = prometheus.exporter.unix.node.targets
+      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]
@@ -616,13 +607,13 @@ data:
     }
 
     loki.source.file "auditlogs" {
-      targets               = local.file_match.auditlogs.targets
-      forward_to            = [loki.write.default.receiver]
+      targets     = local.file_match.auditlogs.targets
+      forward_to  = [loki.write.default.receiver]
     }
 
     loki.write "default" {
       endpoint {
-        url = "https://loki.peterg.nl/loki/api/v1/push"
+        url       = "https://loki.peterg.nl/loki/api/v1/push"
         tenant_id = "wheatley"
       }
     }
@@ -630,6 +621,7 @@ data:
     prometheus.remote_write "default" {
       external_labels = {
         cluster = "k8s-peterg",
+        node    = env("HOSTNAME")
       }
 
       endpoint {