diff --git a/metrics/grafana/dashboards/00-kafka-connect-dashboard.yaml b/metrics/grafana/dashboards/00-kafka-connect-dashboard.yaml
index 7fe58376..244b6b97 100755
--- a/metrics/grafana/dashboards/00-kafka-connect-dashboard.yaml
+++ b/metrics/grafana/dashboards/00-kafka-connect-dashboard.yaml
@@ -492,7 +492,7 @@ spec:
           "targets": [
             {
               "datasource": "${DS_THANOS}",
-              "expr": "sum(rate(kafka_consumer_incoming_byte_total{strimzi_io_kind=~\"KafkaConnect.*\",strimzi_io_cluster=\"$strimzi_connect_cluster_name\"}[5m])) by (kubernetes_pod_name)",
+              "expr": "sum(rate(kafka_consumer_incoming_byte_total{strimzi_io_kind=~\"KafkaConnect.*\",strimzi_io_cluster=\"$strimzi_connect_cluster_name\"}[10m])) by (kubernetes_pod_name)",
               "interval": "",
               "legendFormat": "{{kubernetes_pod_name}}",
               "refId": "A"
diff --git a/metrics/grafana/dashboards/00-kafka-dashboard.yaml b/metrics/grafana/dashboards/00-kafka-dashboard.yaml
index 2de3f36e..73e3b4f5 100755
--- a/metrics/grafana/dashboards/00-kafka-dashboard.yaml
+++ b/metrics/grafana/dashboards/00-kafka-dashboard.yaml
@@ -954,7 +954,7 @@ spec:
           "targets": [
             {
               "datasource": "${DS_THANOS}",
-              "expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-(kafka|$pool_name)-[0-9]+\"}) by (persistentvolumeclaim)",
+              "expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-$kafka_broker\", persistentvolumeclaim!~\".*zookeeper(-[0-9]+)?$\"}) by (persistentvolumeclaim)",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 1,
@@ -2878,26 +2878,6 @@ spec:
             "type": "query",
             "useTags": false
           },
-          {
-            "current": {},
-            "datasource": "${DS_THANOS}",
-            "definition": "",
-            "hide": 2,
-            "includeAll": true,
-            "label": "Pool name",
-            "multi": true,
-            "name": "pool_name",
-            "options": [],
-            "query": "query_result(kafka_server_replicamanager_leadercount{namespace=\"$kubernetes_namespace\", clusterName=~\"$OPENSHIFT_CLUSTER\"})",
-            "refresh": 1,
-            "regex": "/.*strimzi_io_pool_name=\"([^\"]*).*/",
-            "skipUrlSync": false,
-            "sort": 3,
-            "tagValuesQuery": "",
-            "tagsQuery": "",
-            "type": "query",
-            "useTags": false
-          },
           {
             "allValue": ".*",
             "current": {},
diff --git a/metrics/grafana/dashboards/00-kafka-kraft-dashboard.yaml b/metrics/grafana/dashboards/00-kafka-kraft-dashboard.yaml
index 0706fe65..aa1fedb5 100755
--- a/metrics/grafana/dashboards/00-kafka-kraft-dashboard.yaml
+++ b/metrics/grafana/dashboards/00-kafka-kraft-dashboard.yaml
@@ -323,7 +323,7 @@ spec:
           "targets": [
             {
               "datasource": "${DS_THANOS}",
-              "expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-(kafka|$pool_name)-[0-9]+\"}) by (persistentvolumeclaim)",
+              "expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-$kraft_node\", persistentvolumeclaim!~\".*zookeeper(-[0-9]+)?$\"}) by (persistentvolumeclaim)",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 1,
@@ -1974,26 +1974,6 @@ spec:
             "type": "query",
             "useTags": false
           },
-          {
-            "current": {},
-            "datasource": "${DS_THANOS}",
-            "definition": "",
-            "hide": 2,
-            "includeAll": true,
-            "label": "Pool name",
-            "multi": true,
-            "name": "pool_name",
-            "options": [],
-            "query": "query_result(kafka_server_replicamanager_leadercount{namespace=\"$kubernetes_namespace\", clusterName=~\"$OPENSHIFT_CLUSTER\"})",
-            "refresh": 1,
-            "regex": "/.*strimzi_io_pool_name=\"([^\"]*).*/",
-            "skipUrlSync": false,
-            "sort": 3,
-            "tagValuesQuery": "",
-            "tagsQuery": "",
-            "type": "query",
-            "useTags": false
-          },
           {
             "allValue": ".*",
             "current": {},
diff --git a/metrics/grafana/dashboards/00-zookeeper-dashboard.yaml b/metrics/grafana/dashboards/00-zookeeper-dashboard.yaml
index 403d0acb..fd8bfe70 100755
--- a/metrics/grafana/dashboards/00-zookeeper-dashboard.yaml
+++ b/metrics/grafana/dashboards/00-zookeeper-dashboard.yaml
@@ -819,7 +819,7 @@ spec:
           "targets": [
             {
               "datasource": "${DS_THANOS}",
-              "expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-zookeeper-[0-9]+\"}) by (persistentvolumeclaim)",
+              "expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-$zk_node\", persistentvolumeclaim=~\".*zookeeper(-[0-9]+)?$\"}) by (persistentvolumeclaim)",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "{{persistentvolumeclaim}}",
@@ -910,7 +910,7 @@ spec:
           "targets": [
             {
               "datasource": "${DS_THANOS}",
-              "expr": "sum(process_open_fds{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-zookeeper-[0-9+]\",container=\"zookeeper\"}) by (kubernetes_pod_name)",
+              "expr": "sum(process_open_fds{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-$zk_node\",container=\"zookeeper\"}) by (kubernetes_pod_name)",
               "format": "time_series",
               "hide": false,
               "intervalFactor": 1,
@@ -1272,7 +1272,7 @@ spec:
           "targets": [
             {
               "datasource": "${DS_THANOS}",
-              "expr": "sum(jvm_threads_current{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-zookeeper-[0-9+]\",strimzi_io_name=\"$strimzi_cluster_name-zookeeper\"}) by (kubernetes_pod_name)",
+              "expr": "sum(jvm_threads_current{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-$zk_node\",strimzi_io_name=\"$strimzi_cluster_name-zookeeper\"}) by (kubernetes_pod_name)",
               "format": "time_series",
               "intervalFactor": 1,
               "legendFormat": "{{kubernetes_pod_name}}",