diff --git a/infra/values/fluent-bit-values.yaml b/infra/values/fluent-bit-values.yaml
index 9510964..0d00154 100644
--- a/infra/values/fluent-bit-values.yaml
+++ b/infra/values/fluent-bit-values.yaml
@@ -48,8 +48,7 @@ config:
         Match kube.*
         Host loki-gateway.monitoring.svc.cluster.local
         Port 80
-        Labels job=fluent-bit
-        Label_Map_Path /fluent-bit/etc/labelmap.json
+        Labels job=fluent-bit, namespace=$kubernetes['namespace_name'], pod=$kubernetes['pod_name'], container=$kubernetes['container_name']
         Line_Format json
 
     [OUTPUT]
@@ -60,15 +59,6 @@ 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
diff --git a/infra/values/loki-values.yaml b/infra/values/loki-values.yaml
index 70bc04a..40200bc 100644
--- a/infra/values/loki-values.yaml
+++ b/infra/values/loki-values.yaml
@@ -22,6 +22,7 @@ loki:
     reject_old_samples_max_age: 168h
     ingestion_rate_mb: 10
     ingestion_burst_size_mb: 20
+    max_entry_size: 512000
 chunksCache:
   enabled: false
 singleBinary: