diff --git a/infra/values/fluent-bit-values.yaml b/infra/values/fluent-bit-values.yaml
index ccbf1c4..9510964 100644
--- a/infra/values/fluent-bit-values.yaml
+++ b/infra/values/fluent-bit-values.yaml
@@ -42,13 +42,6 @@ config:
         K8S-Logging.Parser On
         K8S-Logging.Exclude On
 
-    [FILTER]
-        Name nest
-        Match kube.*
-        Operation lift
-        Nested_under kubernetes
-        Add_prefix kubernetes_
-
   outputs: |
     [OUTPUT]
         Name loki
@@ -56,7 +49,7 @@ config:
         Host loki-gateway.monitoring.svc.cluster.local
         Port 80
         Labels job=fluent-bit
-        Label_Keys kubernetes_namespace_name,kubernetes_pod_name,kubernetes_container_name
+        Label_Map_Path /fluent-bit/etc/labelmap.json
         Line_Format json
 
     [OUTPUT]
@@ -67,6 +60,16 @@ config:
         Labels job=fluent-bit-systemd
         Line_Format json
 
+  extraFiles:
+    labelmap.json: |
+      {
+        "kubernetes": {
+          "namespace_name": "namespace",
+          "pod_name": "pod",
+          "container_name": "container"
+        }
+      }
+
 tolerations:
 - key: node-role.kubernetes.io/control-plane
   operator: Exists