diff --git a/nginx-monitoring-ingress.json b/nginx-monitoring-ingress.json
index 3cca689..aa8f43d 100644
--- a/nginx-monitoring-ingress.json
+++ b/nginx-monitoring-ingress.json
@@ -18,7 +18,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 31,
+  "id": 93,
   "links": [],
   "panels": [
     {
@@ -105,7 +105,7 @@
         {
           "direction": "backward",
           "editorMode": "code",
-          "expr": "count_over_time({job=\"$job\"} [1m])",
+          "expr": "count_over_time({service_name=\"ingress-nginx\", cluster=\"$cluster\"}[1m])",
           "queryType": "range",
           "refId": "A"
         }
@@ -114,6 +114,10 @@
       "type": "timeseries"
     },
     {
+      "datasource": {
+        "type": "loki",
+        "uid": "loki"
+      },
       "fieldConfig": {
         "defaults": {},
         "overrides": []
@@ -139,7 +143,10 @@
       "pluginVersion": "11.6.0",
       "targets": [
         {
-          "expr": "{job=\"$job\"} |= \"error\"",
+          "direction": "backward",
+          "editorMode": "code",
+          "expr": "{service_name=\"ingress-nginx\", cluster=\"$cluster\"} |= \"error\"",
+          "queryType": "range",
           "refId": "K"
         }
       ],
@@ -230,7 +237,7 @@
         {
           "direction": "backward",
           "editorMode": "code",
-          "expr": "sum(\r\n  count_over_time(\r\n    {job=\"$job\"}\r\n    | pattern \"<ip> - - [<timestamp>] \\\"<method> <path> <protocol>\\\" <status> <size> \\\"<referrer>\\\" \\\"<user_agent>\\\" <req_len> <req_time> [<upstream>] [<unknown>] <rest>\"\r\n    | status=~\"4..\"\r\n    [1m]\r\n  )\r\n)",
+          "expr": "sum(\r\n  count_over_time(\r\n    {service_name=\"ingress-nginx\", cluster=\"$cluster\"}\r\n    | pattern \"<ip> - - [<timestamp>] \\\"<method> <path> <protocol>\\\" <status> <size> \\\"<referrer>\\\" \\\"<user_agent>\\\" <req_len> <req_time> [<upstream>] [<unknown>] <rest>\"\r\n    | status=~\"4..\"\r\n    [1m]\r\n  )\r\n)",
           "legendFormat": "Errors 4**",
           "queryType": "range",
           "refId": "A"
@@ -271,7 +278,7 @@
         {
           "direction": "backward",
           "editorMode": "code",
-          "expr": "{job=\"$job\"}\r\n| pattern \"<ip> - - [<timestamp>] \\\"<method> <path> <protocol>\\\" <status> <size> \\\"<referrer>\\\" \\\"<user_agent>\\\" <req_len> <req_time> [<upstream>] [<unknown>] <rest>\"\r\n| status=~\"4..\"\r\n| line_format \"{{.status}} {{.method}} {{.path}} time={{.req_time}}\"\r\n",
+          "expr": "{service_name=\"ingress-nginx\", cluster=\"$cluster\"}\r\n| pattern \"<ip> - - [<timestamp>] \\\"<method> <path> <protocol>\\\" <status> <size> \\\"<referrer>\\\" \\\"<user_agent>\\\" <req_len> <req_time> [<upstream>] [<unknown>] <rest>\"\r\n| status=~\"4..\"\r\n| line_format \"{{.status}} {{.method}} {{.path}} time={{.req_time}}\"\r\n",
           "legendFormat": "",
           "queryType": "range",
           "refId": "D"
@@ -364,7 +371,7 @@
         {
           "direction": "backward",
           "editorMode": "code",
-          "expr": "sum(\r\n  count_over_time(\r\n    {job=\"$job\"}\r\n    | pattern \"<ip> - - [<timestamp>] \\\"<method> <path> <protocol>\\\" <status> <size> \\\"<referrer>\\\" \\\"<user_agent>\\\" <req_len> <req_time> [<upstream>] [<unknown>] <rest>\"\r\n    | status=~\"5..\"\r\n    [1m]\r\n  )\r\n)",
+          "expr": "sum(\r\n  count_over_time(\r\n    {service_name=\"ingress-nginx\", cluster=\"$cluster\"}\r\n    | pattern \"<ip> - - [<timestamp>] \\\"<method> <path> <protocol>\\\" <status> <size> \\\"<referrer>\\\" \\\"<user_agent>\\\" <req_len> <req_time> [<upstream>] [<unknown>] <rest>\"\r\n    | status=~\"5..\"\r\n    [1m]\r\n  )\r\n)",
           "legendFormat": "Errors 5**",
           "queryType": "range",
           "refId": "A"
@@ -375,7 +382,8 @@
     },
     {
       "datasource": {
-        "type": "loki"
+        "type": "loki",
+        "uid": "loki"
       },
       "fieldConfig": {
         "defaults": {},
@@ -387,7 +395,7 @@
         "x": 12,
         "y": 22
       },
-      "id": 5,
+      "id": 19,
       "options": {
         "dedupStrategy": "none",
         "enableInfiniteScrolling": false,
@@ -395,7 +403,7 @@
         "prettifyLogMessage": false,
         "showCommonLabels": false,
         "showLabels": false,
-        "showTime": false,
+        "showTime": true,
         "sortOrder": "Descending",
         "wrapLogMessage": false
       },
@@ -404,12 +412,13 @@
         {
           "direction": "backward",
           "editorMode": "code",
-          "expr": "{job=\"$job\"}\r\n| pattern \"<ip> - - [<timestamp>] \\\"<method> <path> <protocol>\\\" <status> <size> \\\"<referrer>\\\" \\\"<user_agent>\\\" <req_len> <req_time> [<upstream>] [<unknown>] <rest>\"\r\n| status=~\"5..\"\r\n| line_format \"{{.status}} {{.method}} {{.path}} time={{.req_time}}\"",
+          "expr": "{service_name=\"ingress-nginx\", cluster=\"$cluster\"}\r\n| pattern \"<ip> - - [<timestamp>] \\\"<method> <path> <protocol>\\\" <status> <size> \\\"<referrer>\\\" \\\"<user_agent>\\\" <req_len> <req_time> [<upstream>] [<unknown>] <rest>\"\r\n| status=~\"5..\"\r\n| line_format \"{{.status}} {{.method}} {{.path}} time={{.req_time}}\"\r\n",
+          "legendFormat": "",
           "queryType": "range",
-          "refId": "E"
+          "refId": "D"
         }
       ],
-      "title": "5xx Responses",
+      "title": "5xx Responses ",
       "type": "logs"
     },
     {
@@ -496,7 +505,7 @@
         {
           "direction": "backward",
           "editorMode": "code",
-          "expr": "sum(\r\n  count_over_time(\r\n    {job=\"$job\"}\r\n    | pattern \"<ip> - - [<timestamp>] \\\"<method> <path> <protocol>\\\" <status> <size> \\\"<referrer>\\\" \\\"<user_agent>\\\" <req_len> <req_time> [<upstream>] [<unknown>] <rest>\"\r\n    | status=~\"2..\"\r\n    [1m]\r\n  )\r\n)",
+          "expr": "sum(\r\n  count_over_time(\r\n    {service_name=\"ingress-nginx\", cluster=\"$cluster\"}\r\n    | pattern \"<ip> - - [<timestamp>] \\\"<method> <path> <protocol>\\\" <status> <size> \\\"<referrer>\\\" \\\"<user_agent>\\\" <req_len> <req_time> [<upstream>] [<unknown>] <rest>\"\r\n    | status=~\"2..\"\r\n    [1m]\r\n  )\r\n)",
           "legendFormat": "Status 2**",
           "queryType": "range",
           "refId": "A"
@@ -537,7 +546,7 @@
         {
           "direction": "backward",
           "editorMode": "code",
-          "expr": "{job=\"$job\"}\r\n| pattern \"<ip> - - [<timestamp>] \\\"<method> <path> <protocol>\\\" <status> <size> \\\"<referrer>\\\" \\\"<user_agent>\\\" <req_len> <req_time> [<upstream>] [<unknown>] <rest>\"\r\n| status=~\"2..\"\r\n| line_format \"{{.status}} {{.method}} {{.path}} time={{.req_time}}\"\r\n",
+          "expr": "{service_name=\"ingress-nginx\", cluster=\"$cluster\"}\r\n| pattern \"<ip> - - [<timestamp>] \\\"<method> <path> <protocol>\\\" <status> <size> \\\"<referrer>\\\" \\\"<user_agent>\\\" <req_len> <req_time> [<upstream>] [<unknown>] <rest>\"\r\n| status=~\"2..\"\r\n| line_format \"{{.status}} {{.method}} {{.path}} time={{.req_time}}\"\r\n",
           "legendFormat": "",
           "queryType": "range",
           "refId": "D"
@@ -550,27 +559,24 @@
   "preload": false,
   "refresh": "30s",
   "schemaVersion": 41,
-  "tags": [
-    "nginx"
-  ],
+  "tags": [],
   "templating": {
     "list": [
       {
         "current": {
-          "text": "ingress-nginx/controller",
-          "value": "ingress-nginx/controller"
+          "text": "local",
+          "value": "local"
         },
-        "datasource": "Loki",
-        "definition": "",
-        "name": "job",
+        "definition": "label_values(cluster)",
+        "name": "cluster",
         "options": [],
         "query": {
-          "label": "job",
-          "refId": "LokiVariableQueryEditor-VariableQuery",
-          "stream": "{job=~\".*ingress.*/controller\"}",
-          "type": 1
+          "qryType": 1,
+          "query": "label_values(cluster)",
+          "refId": "PrometheusVariableQueryEditor-VariableQuery"
         },
         "refresh": 1,
+        "regex": "",
         "type": "query"
       }
     ]
@@ -582,6 +588,6 @@
   "timepicker": {},
   "timezone": "browser",
   "title": "NGINX Monitoring",
-  "uid": "een8aog8vuakge",
-  "version": 34
+  "uid": "bewcnab9lgpvkfnewnginx",
+  "version": 12
 }
\ No newline at end of file