diff --git a/dashboards/service/grafana-operator.json b/dashboards/service/grafana-operator.json
index 096ba27..1623b6d 100644
--- a/dashboards/service/grafana-operator.json
+++ b/dashboards/service/grafana-operator.json
@@ -80,7 +80,9 @@
         "orientation": "horizontal",
         "percentChangeColorMode": "standard",
         "reduceOptions": {
-          "calcs": ["min"],
+          "calcs": [
+            "min"
+          ],
           "fields": "",
           "values": false
         },
@@ -91,10 +93,10 @@
       "pluginVersion": "12.0.0",
       "targets": [
         {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "editorMode": "code",
           "expr": "sum(up{job=\"$job\", $k8sClusterLabelKey=\"$cluster\"})",
           "format": "time_series",
@@ -109,7 +111,8 @@
     },
     {
       "datasource": {
-        "uid": "$datasource"
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -175,7 +178,10 @@
               {
                 "id": "custom.lineStyle",
                 "value": {
-                  "dash": [10, 10],
+                  "dash": [
+                    10,
+                    10
+                  ],
                   "fill": "dash"
                 }
               },
@@ -201,7 +207,10 @@
               {
                 "id": "custom.lineStyle",
                 "value": {
-                  "dash": [10, 10],
+                  "dash": [
+                    10,
+                    10
+                  ],
                   "fill": "dash"
                 }
               },
@@ -244,10 +253,10 @@
       "pluginVersion": "12.0.0",
       "targets": [
         {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "editorMode": "code",
           "expr": "rate(process_cpu_seconds_total{job=\"$job\", pod=~\"$pod\", $k8sClusterLabelKey=\"$cluster\"}[5m])",
           "format": "time_series",
@@ -259,7 +268,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "$datasource"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
           "expr": "sum(\r\n    kube_pod_container_resource_requests{job=\"$kubeStateMetricsJob\", namespace=\"monitoring-system\", pod=~\"$pod\", resource=\"cpu\", $k8sClusterLabelKey=\"$cluster\"}\r\n)",
@@ -272,7 +281,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "$datasource"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
           "expr": "sum(\r\n    kube_pod_container_resource_limits{job=\"$kubeStateMetricsJob\", namespace=\"monitoring-system\", pod=~\"$pod\", resource=\"cpu\", $k8sClusterLabelKey=\"$cluster\"}\r\n)",
@@ -288,7 +297,8 @@
     },
     {
       "datasource": {
-        "uid": "$datasource"
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -353,7 +363,10 @@
               {
                 "id": "custom.lineStyle",
                 "value": {
-                  "dash": [10, 10],
+                  "dash": [
+                    10,
+                    10
+                  ],
                   "fill": "dash"
                 }
               },
@@ -379,7 +392,10 @@
               {
                 "id": "custom.lineStyle",
                 "value": {
-                  "dash": [10, 10],
+                  "dash": [
+                    10,
+                    10
+                  ],
                   "fill": "dash"
                 }
               },
@@ -422,10 +438,10 @@
       "pluginVersion": "12.0.0",
       "targets": [
         {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "editorMode": "code",
           "expr": "process_resident_memory_bytes{job=\"$job\", pod=~\"$pod\", $k8sClusterLabelKey=\"$cluster\"}",
           "format": "time_series",
@@ -437,7 +453,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "$datasource"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
           "expr": "sum(\r\n    kube_pod_container_resource_requests{job=\"$kubeStateMetricsJob\", namespace=\"monitoring-system\", pod=~\"$pod\", resource=\"memory\", $k8sClusterLabelKey=\"$cluster\"}\r\n)",
@@ -450,7 +466,7 @@
         {
           "datasource": {
             "type": "prometheus",
-            "uid": "$datasource"
+            "uid": "${DS_PROMETHEUS}"
           },
           "editorMode": "code",
           "expr": "sum(\r\n    kube_pod_container_resource_limits{job=\"$kubeStateMetricsJob\", namespace=\"monitoring-system\", pod=~\"$pod\", resource=\"memory\", $k8sClusterLabelKey=\"$cluster\"}\r\n)",
@@ -466,7 +482,8 @@
     },
     {
       "datasource": {
-        "uid": "$datasource"
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -547,10 +564,10 @@
       "pluginVersion": "12.0.0",
       "targets": [
         {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "editorMode": "code",
           "expr": "go_goroutines{job=\"$job\", pod=~\"$pod\", $k8sClusterLabelKey=\"$cluster\"}",
           "format": "time_series",
@@ -614,7 +631,9 @@
         "orientation": "auto",
         "percentChangeColorMode": "standard",
         "reduceOptions": {
-          "calcs": ["lastNotNull"],
+          "calcs": [
+            "lastNotNull"
+          ],
           "fields": "",
           "values": false
         },
@@ -779,7 +798,8 @@
     },
     {
       "datasource": {
-        "uid": "$datasource"
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -846,7 +866,9 @@
       "options": {
         "dataLinks": [],
         "legend": {
-          "calcs": ["lastNotNull"],
+          "calcs": [
+            "lastNotNull"
+          ],
           "displayMode": "table",
           "placement": "right",
           "showLegend": true
@@ -860,10 +882,10 @@
       "pluginVersion": "12.0.0",
       "targets": [
         {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "editorMode": "code",
           "expr": "sum(rate(workqueue_adds_total{job=\"$job\", pod=~\"$pod\", $k8sClusterLabelKey=\"$cluster\"}[$__rate_interval])) by (pod, name)",
           "format": "time_series",
@@ -878,7 +900,8 @@
     },
     {
       "datasource": {
-        "uid": "$datasource"
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -936,10 +959,10 @@
       "pluginVersion": "12.0.0",
       "targets": [
         {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "editorMode": "code",
           "exemplar": false,
           "expr": "sum by (name) (workqueue_depth{job=\"$job\", $k8sClusterLabelKey=\"$cluster\"})",
@@ -956,7 +979,8 @@
     },
     {
       "datasource": {
-        "uid": "$datasource"
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1023,7 +1047,9 @@
       "options": {
         "dataLinks": [],
         "legend": {
-          "calcs": ["lastNotNull"],
+          "calcs": [
+            "lastNotNull"
+          ],
           "displayMode": "table",
           "placement": "right",
           "showLegend": true
@@ -1037,10 +1063,10 @@
       "pluginVersion": "12.0.0",
       "targets": [
         {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "editorMode": "code",
           "expr": "histogram_quantile(0.99, sum(rate(workqueue_queue_duration_seconds_bucket{job=\"$job\", pod=~\"$pod\", $k8sClusterLabelKey=\"$cluster\"}[$__rate_interval])) by (pod, name, le))",
           "format": "time_series",
@@ -1055,7 +1081,8 @@
     },
     {
       "datasource": {
-        "uid": "$datasource"
+        "type": "prometheus",
+        "uid": "${DS_PROMETHEUS}"
       },
       "fieldConfig": {
         "defaults": {
@@ -1136,10 +1163,10 @@
       "pluginVersion": "12.0.0",
       "targets": [
         {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "editorMode": "code",
           "expr": "sum by (pod) (rate(rest_client_requests_total{job=\"$job\", code=~\"2..\", pod=~\"$pod\", $k8sClusterLabelKey=\"$cluster\"}[$__rate_interval]))",
           "format": "time_series",
@@ -1149,10 +1176,10 @@
           "refId": "A"
         },
         {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "editorMode": "code",
           "expr": "sum by (pod) (rate(rest_client_requests_total{job=\"$job\", code=~\"3..\", pod=~\"$pod\", $k8sClusterLabelKey=\"$cluster\"}[$__rate_interval]))",
           "format": "time_series",
@@ -1162,10 +1189,10 @@
           "refId": "B"
         },
         {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "editorMode": "code",
           "expr": "sum by (pod) (rate(rest_client_requests_total{job=\"$job\", code=~\"4..\", pod=~\"$pod\", $k8sClusterLabelKey=\"$cluster\"}[$__rate_interval]))",
           "format": "time_series",
@@ -1175,10 +1202,10 @@
           "refId": "C"
         },
         {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${DS_PROMETHEUS}"
-      },
+          "datasource": {
+            "type": "prometheus",
+            "uid": "${DS_PROMETHEUS}"
+          },
           "editorMode": "code",
           "expr": "sum by (pod) (rate(rest_client_requests_total{job=\"$job\", code=~\"5..\", pod=~\"$pod\", $k8sClusterLabelKey=\"$cluster\"}[$__rate_interval]))",
           "format": "time_series",
@@ -1294,6 +1321,10 @@
   "templating": {
     "list": [
       {
+        "current": {
+          "text": "Prometheus",
+          "value": "kube-prometheus-stack"
+        },
         "includeAll": false,
         "label": "Datasource",
         "name": "DS_PROMETHEUS",
@@ -1345,6 +1376,10 @@
           "text": "",
           "value": ""
         },
+        "datasource": {
+          "type": "prometheus",
+          "uid": "kube-prometheus-stack"
+        },
         "definition": "label_values(up{job=\"apiserver\"},$k8sClusterLabelKey)",
         "label": "K8s Cluster",
         "name": "cluster",
@@ -1363,6 +1398,10 @@
           "text": "grafana-operator-metrics-service",
           "value": "grafana-operator-metrics-service"
         },
+        "datasource": {
+          "type": "prometheus",
+          "uid": "kube-prometheus-stack"
+        },
         "definition": "label_values(grafana_operator_grafana_api_requests{$k8sClusterLabelKey=\"$cluster\"},job)",
         "label": "Scrape Job",
         "name": "job",
@@ -1380,7 +1419,13 @@
         "allValue": "grafana-operator-.*",
         "current": {
           "text": "All",
-          "value": ["$__all"]
+          "value": [
+            "$__all"
+          ]
+        },
+        "datasource": {
+          "type": "prometheus",
+          "uid": "kube-prometheus-stack"
         },
         "definition": "label_values(up{job=\"$job\", $k8sClusterLabelKey=\"$cluster\"},pod)",
         "includeAll": true,