diff --git a/infra/values/grafana-values.yaml b/infra/values/grafana-values.yaml
index 6be95d4..d2c678e 100644
--- a/infra/values/grafana-values.yaml
+++ b/infra/values/grafana-values.yaml
@@ -84,7 +84,7 @@ dashboards:
               "datasource": { "type": "loki", "uid": "loki" },
               "targets": [
                 {
-                  "expr": "{namespace=\"dot-ai\"} |= ``",
+                  "expr": "{namespace=\"dot-ai\", pod=~\"$pod\"} | json | label_format level=`{{if .level}}{{.level}}{{else if eq .stream \"stderr\"}}error{{else}}info{{end}}` | line_format `{{.message}}{{.msg}}{{.log}}`",
                   "refId": "A"
                 }
               ],
@@ -96,7 +96,8 @@ dashboards:
                 "prettifyLogMessage": false,
                 "enableLogDetails": true,
                 "sortOrder": "Descending",
-                "dedupStrategy": "none"
+                "dedupStrategy": "none",
+                "displayedFields": ["pod", "level"]
               }
             },
             {
@@ -106,7 +107,7 @@ dashboards:
               "datasource": { "type": "loki", "uid": "loki" },
               "targets": [
                 {
-                  "expr": "{namespace=\"dot-ai\"} |~ \"(?i)(error|warn|panic|fatal)\"",
+                  "expr": "{namespace=\"dot-ai\", pod=~\"$pod\"} | json | label_format level=`{{if .level}}{{.level}}{{else if eq .stream \"stderr\"}}error{{else}}info{{end}}` | level=~`error|warn|warning|fatal|panic` | line_format `{{.message}}{{.msg}}{{.log}}`",
                   "refId": "A"
                 }
               ],
@@ -118,7 +119,8 @@ dashboards:
                 "prettifyLogMessage": false,
                 "enableLogDetails": true,
                 "sortOrder": "Descending",
-                "dedupStrategy": "none"
+                "dedupStrategy": "none",
+                "displayedFields": ["pod", "level"]
               }
             }
           ],