diff --git a/kubernetes/grafana-dashboards/kubernetes-pods/kubernetes-cluster.json b/kubernetes/grafana-dashboards/kubernetes-pods/kubernetes-cluster.json
index 46988bf..2abaa3a 100644
--- a/kubernetes/grafana-dashboards/kubernetes-pods/kubernetes-cluster.json
+++ b/kubernetes/grafana-dashboards/kubernetes-pods/kubernetes-cluster.json
@@ -2572,40 +2572,50 @@
         "type": "datasource"
       },
       {
-        "current": {
-          "text": ".*",
-          "value": ".*"
-        },
-        "hide": 0,
-        "label": null,
-        "name": "node",
-        "options": [
-          {
-            "selected": true,
-            "text": ".*",
-            "value": ".*"
-          }
-        ],
-        "query": ".*",
-        "type": "constant"
+	"allValue": ".*",
+	"current": {
+	  "text": "All",
+	  "value": "$__all"
+	},
+	"datasource": "${DS_PROMETHEUS}",
+	"hide": 0,
+	"includeAll": true,
+	"label": null,
+	"multi": false,
+	"name": "node",
+	"options": [],
+	"query": "label_values(kube_node_info, node)",
+	"refresh": 1,
+	"regex": "",
+	"sort": 2,
+	"tagValuesQuery": "",
+	"tags": [],
+	"tagsQuery": "",
+	"type": "query",
+	"useTags": false
       },
       {
-        "current": {
-          "text": ".*",
-          "value": ".*"
-        },
-        "hide": 0,
-        "label": null,
-        "name": "namespace",
-        "options": [
-          {
-            "selected": true,
-            "text": ".*",
-            "value": ".*"
-          }
-        ],
-        "query": ".*",
-        "type": "constant"
+	"allValue": ".*",
+	"current": {
+	  "text": "All",
+	  "value": "$__all"
+	},
+	"datasource": "${DS_PROMETHEUS}",
+	"hide": 0,
+	"includeAll": true,
+	"label": null,
+	"multi": false,
+	"name": "namespace",
+	"options": [],
+	"query": "label_values(kube_pod_info, namespace)",
+	"refresh": 1,
+	"regex": "",
+	"sort": 2,
+	"tagValuesQuery": "",
+	"tags": [],
+	"tagsQuery": "",
+	"type": "query",
+	"useTags": false
       }
     ]
   },
diff --git a/kubernetes/grafana-dashboards/kubernetes-pods/kubernetes-pods.json b/kubernetes/grafana-dashboards/kubernetes-pods/kubernetes-pods.json
index a89b7d1..e23c71e 100644
--- a/kubernetes/grafana-dashboards/kubernetes-pods/kubernetes-pods.json
+++ b/kubernetes/grafana-dashboards/kubernetes-pods/kubernetes-pods.json
@@ -586,10 +586,10 @@
         "multi": false,
         "name": "namespace",
         "options": [],
-        "query": "",
-        "refresh": 0,
+        "query": "label_values(kube_pod_info, namespace)",
+        "refresh": 1,
         "regex": "",
-        "sort": 0,
+        "sort": 2,
         "tagValuesQuery": "",
         "tags": [],
         "tagsQuery": "",
@@ -597,22 +597,27 @@
         "useTags": false
       },
       {
+        "allValue": ".*",
         "current": {
-          "text": ".*",
-          "value": ".*"
+          "text": "All",
+          "value": "$__all"
         },
+        "datasource": "${DS_PROMETHEUS}",
         "hide": 0,
+        "includeAll": true,
         "label": null,
+        "multi": false,
         "name": "pod_name",
-        "options": [
-          {
-            "selected": true,
-            "text": "",
-            "value": ""
-          }
-        ],
-        "query": "",
-        "type": "constant"
+        "options": [],
+        "query": "label_values(kube_pod_info{namespace=\"$namespace\"}, pod)",
+        "refresh": 1,
+        "regex": "",
+        "sort": 2,
+        "tagValuesQuery": "",
+        "tags": [],
+        "tagsQuery": "",
+        "type": "query",
+        "useTags": false
       }
     ]
   },