diff --git a/services/monitoring/deploy/alloy/kube-scraper/helm-values.yaml b/services/monitoring/deploy/alloy/kube-scraper/helm-values.yaml
index db3df8e..d5b2dd4 100644
--- a/services/monitoring/deploy/alloy/kube-scraper/helm-values.yaml
+++ b/services/monitoring/deploy/alloy/kube-scraper/helm-values.yaml
@@ -141,17 +141,12 @@ alloy:
         stage.static_labels {
           values = {
             cluster = env("CLUSTER_NAME"),
-            host    = "icarus-kube",
+            host    = "env("CLUSTER_NAME")",
             job     = "cluster_events",
             zone    = env("ZONE"),
           }
         }
 
-      //  stage.labels {
-      //    values = {
-      //      kubernetes_cluster_events = "job",
-      //    }
-      //  }
       }
 
 
@@ -199,24 +194,15 @@ alloy:
         }
 
         rule {
-          target_label = "node"
-          replacement  = env("HOSTNAME")
+          source_labels = ["exported_node"]
+          target_label  = "node"
         }
 
-        // rule {
-        //   target_label = "service"
-        //   replacement  = "kube-scrapper"
-        // }
-
         rule {
           target_label = "cluster"
           replacement  = env("CLUSTER_NAME")
         }
 
-        // rule {
-        //   target_label = "job"
-        //   replacement  = "kubelet"
-        // }
       }
 
 
@@ -234,8 +220,8 @@ alloy:
         }
 
         rule {
-          target_label = "node"
-          replacement  = env("HOSTNAME")
+          source_labels = ["exported_node"]
+          target_label  = "node"
         }
 
         rule {
@@ -265,11 +251,6 @@ alloy:
           regex         = "kubernetes"
           action        = "keep"
         }
-          rule {
-          target_label = "node"
-          replacement  = env("HOSTNAME")
-        }
-
         rule {
           target_label = "cluster"
           replacement  = env("CLUSTER_NAME")
@@ -305,11 +286,6 @@ alloy:
           regex         = "kube-dns"
           action        = "keep"
         }
-        rule {
-          target_label = "node"
-          replacement  = env("HOSTNAME")
-        }
-        
         rule {
           target_label = "cluster"
           replacement  = env("CLUSTER_NAME")