diff --git a/infra/values/fluent-bit-values.yaml b/infra/values/fluent-bit-values.yaml
index 718f9cd..ccbf1c4 100644
--- a/infra/values/fluent-bit-values.yaml
+++ b/infra/values/fluent-bit-values.yaml
@@ -42,20 +42,28 @@ 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
         Match kube.*
-        Host loki.monitoring.svc.cluster.local
-        Port 3100
+        Host loki-gateway.monitoring.svc.cluster.local
+        Port 80
         Labels job=fluent-bit
+        Label_Keys kubernetes_namespace_name,kubernetes_pod_name,kubernetes_container_name
         Line_Format json
 
     [OUTPUT]
         Name loki
         Match host.*
-        Host loki.monitoring.svc.cluster.local
-        Port 3100
+        Host loki-gateway.monitoring.svc.cluster.local
+        Port 80
         Labels job=fluent-bit-systemd
         Line_Format json
 
diff --git a/infra/values/grafana-values.yaml b/infra/values/grafana-values.yaml
index 6536fc5..c2c51b5 100644
--- a/infra/values/grafana-values.yaml
+++ b/infra/values/grafana-values.yaml
@@ -24,7 +24,7 @@ datasources:
       isDefault: true
     - name: Loki
       type: loki
-      url: http://loki.monitoring.svc.cluster.local:3100
+      url: http://loki-gateway.monitoring.svc.cluster.local
       access: proxy
 dashboardProviders:
   dashboardproviders.yaml: