diff --git a/assets/grafana/all-nodes-dashboard.json b/assets/grafana/all-nodes-dashboard.json
index 4e07445d2fe5b9eb6998d348194cb12f65299e6b..839565cd487deb84bb30687d683bdd242a65b6a2 100644
--- a/assets/grafana/all-nodes-dashboard.json
+++ b/assets/grafana/all-nodes-dashboard.json
@@ -1,4 +1,5 @@
 {
+  "dashboard": {
   "__inputs": [
     {
       "name": "DS_PROMETHEUS",
@@ -866,4 +867,14 @@
   "version": 10,
   "links": [],
   "gnetId": 22
+},
+    "inputs": [
+        {
+            "name": "DS_PROMETHEUS",
+            "pluginId": "prometheus",
+            "type": "datasource",
+            "value": "prometheus"
+        }
+    ],
+    "overwrite": true
 }
\ No newline at end of file
diff --git a/assets/grafana/deployment-dashboard.json b/assets/grafana/deployment-dashboard.json
index b09d4a47da30bea7d0a24acebb7775d2d2a30875..69638d15690c68d1c21a9aafe1d310a92345e8d1 100644
--- a/assets/grafana/deployment-dashboard.json
+++ b/assets/grafana/deployment-dashboard.json
@@ -1,4 +1,5 @@
 {
+  "dashboard": {
   "__inputs": [
     {
       "name": "DS_PROMETHEUS",
@@ -803,4 +804,14 @@
   "version": 2,
   "links": [],
   "gnetId": null
+},
+    "inputs": [
+        {
+            "name": "DS_PROMETHEUS",
+            "pluginId": "prometheus",
+            "type": "datasource",
+            "value": "prometheus"
+        }
+    ],
+    "overwrite": true
 }
\ No newline at end of file
diff --git a/assets/grafana/grafana-kubernetes-pods-dashboard.json b/assets/grafana/kubernetes-pods-dashboard.json
similarity index 100%
rename from assets/grafana/grafana-kubernetes-pods-dashboard.json
rename to assets/grafana/kubernetes-pods-dashboard.json
diff --git a/assets/grafana/node-dashboard.json b/assets/grafana/node-dashboard.json
index 10ded0ffe643bd7e3de115cfca989f7010a678ec..bac1eb0d3e950180bc36a6ab965d24c2271c08bb 100644
--- a/assets/grafana/node-dashboard.json
+++ b/assets/grafana/node-dashboard.json
@@ -1,4 +1,5 @@
 {
+  "dashboard": {
   "__inputs": [
     {
       "name": "DS_PROMETHEUS",
@@ -879,4 +880,14 @@
   "version": 1,
   "links": [],
   "gnetId": 22
+},
+    "inputs": [
+        {
+            "name": "DS_PROMETHEUS",
+            "pluginId": "prometheus",
+            "type": "datasource",
+            "value": "prometheus"
+        }
+    ],
+    "overwrite": true
 }
\ No newline at end of file
diff --git a/manifests/grafana/grafana-cm.yaml b/manifests/grafana/grafana-cm.yaml
index a0488f6435723208ed56710027b4fe98b69da126..db41fd6060d9cf740061eb27577de0c8389caa0a 100644
--- a/manifests/grafana/grafana-cm.yaml
+++ b/manifests/grafana/grafana-cm.yaml
@@ -2,6 +2,7 @@ apiVersion: v1
 data:
   all-nodes-dashboard.json: |-
     {
+      "dashboard": {
       "__inputs": [
         {
           "name": "DS_PROMETHEUS",
@@ -869,9 +870,20 @@ data:
       "version": 10,
       "links": [],
       "gnetId": 22
+    },
+        "inputs": [
+            {
+                "name": "DS_PROMETHEUS",
+                "pluginId": "prometheus",
+                "type": "datasource",
+                "value": "prometheus"
+            }
+        ],
+        "overwrite": true
     }
   deployment-dashboard.json: |-
     {
+      "dashboard": {
       "__inputs": [
         {
           "name": "DS_PROMETHEUS",
@@ -1676,8 +1688,18 @@ data:
       "version": 2,
       "links": [],
       "gnetId": null
+    },
+        "inputs": [
+            {
+                "name": "DS_PROMETHEUS",
+                "pluginId": "prometheus",
+                "type": "datasource",
+                "value": "prometheus"
+            }
+        ],
+        "overwrite": true
     }
-  grafana-kubernetes-pods-dashboard.json: |
+  kubernetes-pods-dashboard.json: |
     {
         "dashboard": {
             "__inputs": [
@@ -2089,6 +2111,7 @@ data:
     }
   node-dashboard.json: |-
     {
+      "dashboard": {
       "__inputs": [
         {
           "name": "DS_PROMETHEUS",
@@ -2969,6 +2992,16 @@ data:
       "version": 1,
       "links": [],
       "gnetId": 22
+    },
+        "inputs": [
+            {
+                "name": "DS_PROMETHEUS",
+                "pluginId": "prometheus",
+                "type": "datasource",
+                "value": "prometheus"
+            }
+        ],
+        "overwrite": true
     }
   prometheus-datasource.json: |
     {