diff --git a/inventories/chaosknoten/host_vars/grafana.yaml b/inventories/chaosknoten/host_vars/grafana.yaml
index d2304f9..1ca6b1b 100644
--- a/inventories/chaosknoten/host_vars/grafana.yaml
+++ b/inventories/chaosknoten/host_vars/grafana.yaml
@@ -95,19 +95,28 @@ alloy_config: |
       source_labels = ["__journal_priority_keyword"]
       target_label  = "level"
     }
+    rule {
+      source_labels = ["__journal__hostname"]
+      target_label = "host"
+      regex  = "([^:]+)"
+      replacement = "${1}.hamburg.ccc.de"
+      action = "replace"
+    }
   }
 
   loki.source.journal "read_journal"  {
     forward_to    = [loki.write.default.receiver]
     relabel_rules = loki.relabel.journal.rules
     format_as_json = true
-    labels        = {component = "loki.source.journal", host = "grafana", org = "ccchh"}
+    labels        = {component = "loki.source.journal", org = "ccchh"}
   }
 
   logging {
     level = "info"
   }
-  prometheus.exporter.unix "local_system" { }
+  prometheus.exporter.unix "local_system" {
+    enable_collectors = ["systemd"]
+  }
 
   prometheus.relabel "default" {
     forward_to = [prometheus.remote_write.default.receiver]
@@ -116,12 +125,15 @@ alloy_config: |
       replacement = "ccchh"
     }
     rule {
+      source_labels = ["instance"]
       target_label = "host"
-      replacement = "grafana"
+      regex  = "([^:]+)"
+      replacement = "${1}.hamburg.ccc.de"
+      action = "replace"
     }
   }
 
   prometheus.scrape "scrape_metrics" {
-    targets         = prometheus.exporter.unix.local_system.targets
-    forward_to      = [prometheus.relabel.default.receiver]
+    targets           = prometheus.exporter.unix.local_system.targets
+    forward_to        = [prometheus.relabel.default.receiver]
   }
diff --git a/inventories/chaosknoten/host_vars/ntfy.yaml b/inventories/chaosknoten/host_vars/ntfy.yaml
index 6d0e0eb..23c208b 100644
--- a/inventories/chaosknoten/host_vars/ntfy.yaml
+++ b/inventories/chaosknoten/host_vars/ntfy.yaml
@@ -58,6 +58,13 @@ alloy_config: |
       source_labels = ["__journal_priority_keyword"]
       target_label  = "level"
     }
+    rule {
+      source_labels = ["__journal__hostname"]
+      target_label = "host"
+      regex  = "([^:]+)"
+      replacement = "${1}.hamburg.ccc.de"
+      action = "replace"
+    }
   }
 
   loki.source.journal "read_journal"  {
@@ -67,7 +74,9 @@ alloy_config: |
     labels        = {component = "loki.source.journal", org = "ccchh"}
   }
 
-  prometheus.exporter.unix "local_system" { }
+  prometheus.exporter.unix "local_system" {
+    enable_collectors = ["systemd"]
+  }
 
   prometheus.relabel "default" {
     forward_to = [prometheus.remote_write.default.receiver]
@@ -79,12 +88,12 @@ alloy_config: |
       source_labels = ["instance"]
       target_label = "host"
       regex  = "([^:]+)"
-      replacement = "${1}.hamburg.ccc.det"
+      replacement = "${1}.hamburg.ccc.de"
       action = "replace"
     }
   }
 
   prometheus.scrape "scrape_metrics" {
-    targets         = prometheus.exporter.unix.local_system.targets
-    forward_to      = [prometheus.relabel.default.receiver]
+    targets           = prometheus.exporter.unix.local_system.targets
+    forward_to        = [prometheus.relabel.default.receiver]
   }