diff --git a/infra/values/grafana-values.yaml b/infra/values/grafana-values.yaml
index d2c678e..28391f8 100644
--- a/infra/values/grafana-values.yaml
+++ b/infra/values/grafana-values.yaml
@@ -84,13 +84,13 @@ dashboards:
               "datasource": { "type": "loki", "uid": "loki" },
               "targets": [
                 {
-                  "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}}`",
+                  "expr": "{namespace=\"dot-ai\", pod=~\"$pod\"} | json log=\"log\", message=\"message\", msg=\"msg\", level=\"level\", stream=\"stream\" | label_format level=`{{if .level}}{{.level}}{{else if eq .stream \"stderr\"}}error{{else}}info{{end}}` | line_format `{{or .message .msg .log}}`",
                   "refId": "A"
                 }
               ],
               "options": {
                 "showTime": true,
-                "showLabels": true,
+                "showLabels": false,
                 "showCommonLabels": false,
                 "wrapLogMessage": true,
                 "prettifyLogMessage": false,
@@ -107,13 +107,13 @@ dashboards:
               "datasource": { "type": "loki", "uid": "loki" },
               "targets": [
                 {
-                  "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}}`",
+                  "expr": "{namespace=\"dot-ai\", pod=~\"$pod\"} | json log=\"log\", message=\"message\", msg=\"msg\", level=\"level\", stream=\"stream\" | label_format level=`{{if .level}}{{.level}}{{else if eq .stream \"stderr\"}}error{{else}}info{{end}}` | level=~`error|warn|warning|fatal|panic` | line_format `{{or .message .msg .log}}`",
                   "refId": "A"
                 }
               ],
               "options": {
                 "showTime": true,
-                "showLabels": true,
+                "showLabels": false,
                 "showCommonLabels": false,
                 "wrapLogMessage": true,
                 "prettifyLogMessage": false,