diff --git a/dashboards/system/loki.json b/dashboards/system/loki.json
index 91320c2..9d31829 100644
--- a/dashboards/system/loki.json
+++ b/dashboards/system/loki.json
@@ -20,7 +20,7 @@
   "editable": false,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 102,
+  "id": 90,
   "links": [],
   "panels": [
     {
@@ -117,7 +117,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "transparent"
+                    "color": "transparent",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -194,7 +195,7 @@
             "h": 5,
             "w": 9,
             "x": 0,
-            "y": 7
+            "y": 13
           },
           "id": 10,
           "interval": "1m",
@@ -218,12 +219,14 @@
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "sum(rate(log_messages_total{app=\"loki\",level=~\"error|warn\"}[1m])) by (level)\n",
+              "editorMode": "code",
+              "expr": "sum(rate(log_messages_total{app=\"loki\",level=~\"error|warn\"}[1m])) by (level)",
               "format": "time_series",
               "hide": false,
               "interval": "",
               "intervalFactor": 1,
               "legendFormat": "{{level}}",
+              "range": true,
               "refId": "A"
             },
             {
@@ -245,8 +248,8 @@
         },
         {
           "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
+            "type": "loki",
+            "uid": "P8E80F9AEF21F6940"
           },
           "fieldConfig": {
             "defaults": {},
@@ -256,7 +259,7 @@
             "h": 5,
             "w": 15,
             "x": 9,
-            "y": 7
+            "y": 13
           },
           "id": 511,
           "options": {
@@ -273,11 +276,12 @@
           "targets": [
             {
               "datasource": {
-                "type": "prometheus",
-                "uid": "prometheus"
+                "type": "loki",
+                "uid": "P8E80F9AEF21F6940"
               },
+              "editorMode": "code",
               "expr": "{app=\"loki\"} | logfmt | level=\"warn\" or level=\"error\"",
-              "legendFormat": "",
+              "queryType": "range",
               "refId": "A"
             }
           ],
@@ -335,7 +339,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "transparent"
+                    "color": "transparent",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -412,7 +417,7 @@
             "h": 5,
             "w": 9,
             "x": 0,
-            "y": 12
+            "y": 18
           },
           "id": 106,
           "interval": "1m",
@@ -450,8 +455,8 @@
         },
         {
           "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
+            "type": "loki",
+            "uid": "P8E80F9AEF21F6940"
           },
           "fieldConfig": {
             "defaults": {},
@@ -461,7 +466,7 @@
             "h": 5,
             "w": 15,
             "x": 9,
-            "y": 12
+            "y": 18
           },
           "id": 586,
           "options": {
@@ -478,11 +483,12 @@
           "targets": [
             {
               "datasource": {
-                "type": "prometheus",
-                "uid": "prometheus"
+                "type": "loki",
+                "uid": "P8E80F9AEF21F6940"
               },
+              "editorMode": "code",
               "expr": "{app=\"promtail\"} | logfmt | level=\"warn\" or level=\"error\"",
-              "legendFormat": "",
+              "queryType": "range",
               "refId": "A"
             }
           ],
@@ -538,7 +544,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "transparent"
+                    "color": "transparent",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -554,7 +561,7 @@
             "h": 5,
             "w": 24,
             "x": 0,
-            "y": 17
+            "y": 23
           },
           "id": 676,
           "interval": "1m",
@@ -638,7 +645,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "transparent"
+                    "color": "transparent",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -651,10 +659,10 @@
             "overrides": []
           },
           "gridPos": {
-            "h": 5,
+            "h": 6,
             "w": 24,
             "x": 0,
-            "y": 22
+            "y": 28
           },
           "id": 677,
           "interval": "1m",
@@ -753,7 +761,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "transparent"
+                    "color": "transparent",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -769,7 +778,7 @@
             "h": 6,
             "w": 24,
             "x": 0,
-            "y": 8
+            "y": 281
           },
           "id": 78,
           "options": {
@@ -852,7 +861,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -868,7 +878,7 @@
             "h": 6,
             "w": 24,
             "x": 0,
-            "y": 14
+            "y": 533
           },
           "id": 56,
           "options": {
@@ -951,7 +961,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "transparent"
+                    "color": "transparent",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -967,7 +978,7 @@
             "h": 6,
             "w": 24,
             "x": 0,
-            "y": 20
+            "y": 539
           },
           "id": 137,
           "options": {
@@ -1065,7 +1076,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "transparent"
+                    "color": "transparent",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -1081,7 +1093,7 @@
             "h": 6,
             "w": 24,
             "x": 0,
-            "y": 9
+            "y": 282
           },
           "id": 247,
           "options": {
@@ -1105,10 +1117,12 @@
                 "type": "prometheus",
                 "uid": "prometheus"
               },
-              "expr": "100 * max by(pod,container) (container_memory_working_set_bytes{container!=\"\",container!=\"POD\",pod=~\"loki.*\"})\n/\non (pod,container) group_left  kube_pod_container_resource_limits_memory_bytes{pod=~\"loki.*\"}",
+              "editorMode": "code",
+              "expr": "100 * max by(pod,container) (container_memory_working_set_bytes{container!=\"\",container!=\"POD\",pod=~\"loki.*\"}) / on (pod,container) group_left  kube_pod_container_resource_limits_memory_bytes{pod=~\"loki.*\"}",
               "hide": false,
               "interval": "",
               "legendFormat": "Usage (pod={{pod}}, container={{container}}, name={{name}})",
+              "range": true,
               "refId": "A"
             }
           ],
@@ -1165,7 +1179,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -1231,7 +1246,7 @@
             "h": 6,
             "w": 24,
             "x": 0,
-            "y": 15
+            "y": 452
           },
           "id": 25,
           "options": {
@@ -1339,7 +1354,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "transparent"
+                    "color": "transparent",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -1355,7 +1371,7 @@
             "h": 6,
             "w": 24,
             "x": 0,
-            "y": 21
+            "y": 458
           },
           "id": 772,
           "options": {
@@ -1439,7 +1455,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -1505,7 +1522,7 @@
             "h": 6,
             "w": 24,
             "x": 0,
-            "y": 27
+            "y": 464
           },
           "id": 1103,
           "options": {
@@ -1627,7 +1644,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "transparent"
+                    "color": "transparent",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -1643,7 +1661,7 @@
             "h": 6,
             "w": 24,
             "x": 0,
-            "y": 10
+            "y": 283
           },
           "id": 347,
           "options": {
@@ -1729,7 +1747,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -1795,7 +1814,7 @@
             "h": 6,
             "w": 24,
             "x": 0,
-            "y": 16
+            "y": 289
           },
           "id": 6,
           "options": {
@@ -1903,7 +1922,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "transparent"
+                    "color": "transparent",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -1919,7 +1939,7 @@
             "h": 6,
             "w": 24,
             "x": 0,
-            "y": 22
+            "y": 295
           },
           "id": 910,
           "options": {
@@ -2005,7 +2025,8 @@
                 "mode": "absolute",
                 "steps": [
                   {
-                    "color": "green"
+                    "color": "green",
+                    "value": null
                   },
                   {
                     "color": "red",
@@ -2071,7 +2092,7 @@
             "h": 6,
             "w": 24,
             "x": 0,
-            "y": 28
+            "y": 301
           },
           "id": 1104,
           "options": {
@@ -2158,6 +2179,5 @@
   "timezone": "browser",
   "title": "Loki",
   "uid": "e6a0b019f34e9468223bc1669d5a9366",
-  "version": 3,
   "weekStart": ""
 }