diff --git a/apps/grafana/release.yaml b/apps/grafana/release.yaml
index 6eb61b23..1a7dd942 100644
--- a/apps/grafana/release.yaml
+++ b/apps/grafana/release.yaml
@@ -65,6 +65,19 @@ spec:
       journal:
         enabled: true
         units: []
+        extraLogProcessingStages: |-
+          stage.template {
+            source = "message"
+            template = "{{ if .unit }}unit={{ .unit }} {{ end }}{{ .Entry }}"
+          }
+
+          stage.output {
+            source = "message"
+          }
+
+          stage.label_drop {
+            values = ["unit"]
+          }
       extraConfig: |
         local.file_match "worker_nodes_logs" {
           path_targets = [{
@@ -82,6 +95,19 @@ spec:
         }
 
         loki.process "worker_nodes_logs" {
+          stage.template {
+            source = "message"
+            template = "{{ if .filename }}filename={{ .filename }} {{ end }}{{ .Entry }}"
+          }
+
+          stage.output {
+            source = "message"
+          }
+
+          stage.label_drop {
+            values = ["filename"]
+          }
+
           forward_to = [
             loki.process.logs_service.receiver,
           ]