diff --git a/modules/mixins/alloy-forwarder/config.alloy b/modules/mixins/alloy-forwarder/config.alloy
index 1101c20..6527751 100644
--- a/modules/mixins/alloy-forwarder/config.alloy
+++ b/modules/mixins/alloy-forwarder/config.alloy
@@ -25,7 +25,7 @@ prometheus.relabel "instance" {
   forward_to = [grafana_cloud.stack.receivers.metrics]
   rule {
     target_label = "instance"
-    replacement  = local.file.hostname.content
+    replacement  = trim_space(local.file.hostname.content)
   }
 }
 
diff --git a/modules/mixins/alloy/base.alloy b/modules/mixins/alloy/base.alloy
index f4db4fd..f219010 100644
--- a/modules/mixins/alloy/base.alloy
+++ b/modules/mixins/alloy/base.alloy
@@ -9,7 +9,7 @@ loki.relabel "omnibus" {
 
   rule {
     target_label = "instance"
-    replacement  = local.file.hostname.content
+    replacement  = trim_space(local.file.hostname.content)
   }
 
   rule {
diff --git a/modules/mixins/alloy/config.alloy b/modules/mixins/alloy/config.alloy
index 3f341ff..68108e8 100644
--- a/modules/mixins/alloy/config.alloy
+++ b/modules/mixins/alloy/config.alloy
@@ -27,31 +27,6 @@ otelcol.receiver.loki "default" {
   }
 }
 
-// Extract Systemd unit from journal entry
-loki.relabel "journal" {
-  forward_to = []
-
-  rule {
-    target_label = "instance"
-    replacement  = local.file.hostname.content
-  }
-
-  rule {
-    source_labels = ["__journal__systemd_unit"]
-    target_label  = "unit"
-  }
-
-  rule {
-    source_labels = ["__journal__boot_id"]
-    target_label  = "boot_id"
-  }
-
-  rule {
-    source_labels = ["__journal__transport"]
-    target_label  = "transport"
-  }
-}
-
 // Fetch journal entries
 loki.source.journal "journal" {
   forward_to    = [otelcol.receiver.loki.default.receiver]
@@ -64,7 +39,7 @@ prometheus.relabel "instance" {
   forward_to = [otelcol.receiver.prometheus.default.receiver]
   rule {
     target_label = "instance"
-    replacement  = local.file.hostname.content
+    replacement  = trim_space(local.file.hostname.content)
   }
 }