diff --git a/docs/metrics/prometheus/grafana/bucket/grafana-bucket.png b/docs/metrics/prometheus/grafana/bucket/grafana-bucket.png
index da218d2ac..55c257079 100644
Binary files a/docs/metrics/prometheus/grafana/bucket/grafana-bucket.png and b/docs/metrics/prometheus/grafana/bucket/grafana-bucket.png differ
diff --git a/docs/metrics/prometheus/grafana/bucket/minio-bucket.json b/docs/metrics/prometheus/grafana/bucket/minio-bucket.json
index 8bb49c09d..5ce857900 100644
--- a/docs/metrics/prometheus/grafana/bucket/minio-bucket.json
+++ b/docs/metrics/prometheus/grafana/bucket/minio-bucket.json
@@ -15,16 +15,6 @@
       }
     ]
   },
-  "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "Prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
   "description": "MinIO Grafana Dashboard - https://min.io/",
   "editable": true,
   "fiscalYearStartMonth": 0,
@@ -4151,28 +4141,39 @@
     "list": [
       {
         "current": {
-          "selected": true,
-          "text": "minio-job-bucket",
-          "value": "minio-job-bucket"
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
+        },
+        "label": "Data source",
+        "name": "DS_PROMETHEUS",
+        "options": [],
+        "query": "prometheus",
+        "refresh": 1,
+        "regex": "",
+        "type": "datasource"
+      },
+      {
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
         },
         "datasource": {
           "type": "prometheus",
           "uid": "${DS_PROMETHEUS}"
         },
         "definition": "label_values(job)",
-        "hide": 0,
         "includeAll": false,
-        "multi": false,
         "name": "scrape_jobs",
         "options": [],
         "query": {
+          "qryType": 1,
           "query": "label_values(job)",
-          "refId": "StandardVariableQuery"
+          "refId": "PrometheusVariableQueryEditor-VariableQuery"
         },
         "refresh": 1,
         "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
         "type": "query"
       }
     ]
@@ -4210,4 +4211,4 @@
   "uid": "TgmJnqnnk2",
   "version": 1,
   "weekStart": ""
-}
+}
\ No newline at end of file
diff --git a/docs/metrics/prometheus/grafana/grafana-minio.png b/docs/metrics/prometheus/grafana/grafana-minio.png
index d1c56cef3..6e48f6ef7 100644
Binary files a/docs/metrics/prometheus/grafana/grafana-minio.png and b/docs/metrics/prometheus/grafana/grafana-minio.png differ
diff --git a/docs/metrics/prometheus/grafana/minio-dashboard.json b/docs/metrics/prometheus/grafana/minio-dashboard.json
index 24502d680..8976eb7b3 100644
--- a/docs/metrics/prometheus/grafana/minio-dashboard.json
+++ b/docs/metrics/prometheus/grafana/minio-dashboard.json
@@ -21,16 +21,6 @@
       }
     ]
   },
-  "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "Prometheus",
-      "description": "", 
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
   "description": "MinIO Grafana Dashboard - https://min.io/",
   "editable": true,
   "fiscalYearStartMonth": 0,
@@ -3800,6 +3790,20 @@
   ],
   "templating": {
     "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
+        },
+        "label": "Data source",
+        "name": "DS_PROMETHEUS",
+        "options": [],
+        "query": "prometheus",
+        "refresh": 1,
+        "regex": "",
+        "type": "datasource"
+      },
       {
         "current": {
           "selected": false,
@@ -3861,4 +3865,4 @@
   "uid": "TgmJnqnnk",
   "version": 1,
   "weekStart": ""
-}
+}
\ No newline at end of file
diff --git a/docs/metrics/prometheus/grafana/node/grafana-node.png b/docs/metrics/prometheus/grafana/node/grafana-node.png
index 74c20256d..4b12d5417 100644
Binary files a/docs/metrics/prometheus/grafana/node/grafana-node.png and b/docs/metrics/prometheus/grafana/node/grafana-node.png differ
diff --git a/docs/metrics/prometheus/grafana/node/minio-node.json b/docs/metrics/prometheus/grafana/node/minio-node.json
index a6b917696..783190dd8 100644
--- a/docs/metrics/prometheus/grafana/node/minio-node.json
+++ b/docs/metrics/prometheus/grafana/node/minio-node.json
@@ -15,16 +15,6 @@
       }
     ]
   },
-  "__inputs": [
-    {
-      "name": "DS_PROMETHEUS",
-      "label": "Prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    }
-  ],
   "description": "MinIO Nodes Grafana Dashboard - https://min.io/",
   "editable": true,
   "fiscalYearStartMonth": 0,
@@ -869,7 +859,20 @@
     "list": [
       {
         "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
         },
+        "label": "Data source",
+        "name": "DS_PROMETHEUS",
+        "options": [],
+        "query": "prometheus",
+        "refresh": 1,
+        "regex": "",
+        "type": "datasource"
+      },
+      {
+        "current": {},
         "datasource": {
           "type": "prometheus",
           "uid": "${DS_PROMETHEUS}"
@@ -891,8 +894,7 @@
         "type": "query"
       },
       {
-        "current": {
-        },
+        "current": {},
         "datasource": {
           "type": "prometheus",
           "uid": "${DS_PROMETHEUS}"
@@ -950,4 +952,4 @@
   "uid": "TgmJnnqn2k",
   "version": 1,
   "weekStart": ""
-}
+}
\ No newline at end of file
diff --git a/docs/metrics/prometheus/grafana/replication/minio-replication-cluster.json b/docs/metrics/prometheus/grafana/replication/minio-replication-cluster.json
index 4fb094949..7e34467da 100644
--- a/docs/metrics/prometheus/grafana/replication/minio-replication-cluster.json
+++ b/docs/metrics/prometheus/grafana/replication/minio-replication-cluster.json
@@ -15,16 +15,6 @@
       }
     ]
   },
- "__inputs": [
-    { 
-      "name": "DS_PROMETHEUS",
-      "label": "Prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    } 
-  ],    
   "description": "MinIO Grafana Dashboard - https://min.io/",
   "editable": true,
   "fiscalYearStartMonth": 0,
@@ -2890,7 +2880,20 @@
     "list": [
       {
         "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
         },
+        "label": "Data source",
+        "name": "DS_PROMETHEUS",
+        "options": [],
+        "query": "prometheus",
+        "refresh": 1,
+        "regex": "",
+        "type": "datasource"
+      },
+      {
+        "current": {},
         "datasource": {
           "type": "prometheus",
           "uid": "${DS_PROMETHEUS}"
@@ -2946,4 +2949,4 @@
   "uid": "TgmJnnqnk3",
   "version": 1,
   "weekStart": ""
-}
+}
\ No newline at end of file
diff --git a/docs/metrics/prometheus/grafana/replication/minio-replication-node.json b/docs/metrics/prometheus/grafana/replication/minio-replication-node.json
index c00c05b80..6e0c29b4e 100644
--- a/docs/metrics/prometheus/grafana/replication/minio-replication-node.json
+++ b/docs/metrics/prometheus/grafana/replication/minio-replication-node.json
@@ -15,16 +15,6 @@
       }
     ]
   },
- "__inputs": [
-    { 
-      "name": "DS_PROMETHEUS",
-      "label": "Prometheus",
-      "description": "",
-      "type": "datasource",
-      "pluginId": "prometheus",
-      "pluginName": "Prometheus"
-    } 
-  ],    
   "description": "MinIO Grafana Dashboard - https://min.io/",
   "editable": true,
   "fiscalYearStartMonth": 0,
@@ -2335,7 +2325,20 @@
     "list": [
       {
         "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
         },
+        "label": "Data source",
+        "name": "DS_PROMETHEUS",
+        "options": [],
+        "query": "prometheus",
+        "refresh": 1,
+        "regex": "",
+        "type": "datasource"
+      },
+      {
+        "current": {},
         "datasource": {
           "type": "prometheus",
           "uid": "${DS_PROMETHEUS}"
@@ -2391,4 +2394,4 @@
   "uid": "gmTJnqnnk3",
   "version": 1,
   "weekStart": ""
-}
+}
\ No newline at end of file