diff --git a/CHANGELOG.md b/CHANGELOG.md
index 377df31bd6..a04c11f571 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 * Add support for custom Cruise Control API users
 * Update HTTP bridge to latest 0.30.0 release
 * Unregistration of KRaft nodes after scale-down
+* Update Kafka Exporter to [1.8.0](https://github.com/danielqsj/kafka_exporter/releases/tag/v1.8.0) and update the Grafana dashboard to work with it
 
 ### Changes, deprecations and removals
 
diff --git a/docker-images/kafka-based/kafka/Dockerfile b/docker-images/kafka-based/kafka/Dockerfile
index ee8be9dc78..9733a47149 100644
--- a/docker-images/kafka-based/kafka/Dockerfile
+++ b/docker-images/kafka-based/kafka/Dockerfile
@@ -31,11 +31,11 @@ RUN mkdir $KAFKA_HOME/plugins
 # Add Kafka Exporter
 #####
 ENV KAFKA_EXPORTER_HOME=/opt/kafka-exporter
-ENV KAFKA_EXPORTER_VERSION=1.7.0
-ENV KAFKA_EXPORTER_CHECKSUM_AMD64="1877f640baee81563c88dce935ad875b4bdfa83ba264bea24922573c8d8f994f0f661620c365fc51d1c3888a3f12f8c3564330f87ee491045f41b118ba5c4376  kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-amd64.tar.gz"
-ENV KAFKA_EXPORTER_CHECKSUM_ARM64="a532df77cd12eb7dc83d5822843da4d2d48c56e91fb694de8ccb4a2f7f19e7d25d23c375f31a3bc9e62e99b71ce18c3086fc990abc273b55d12360223093bb97  kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-arm64.tar.gz"
-ENV KAFKA_EXPORTER_CHECKSUM_PPC64LE="48ebb8e4879ea4320cd0a25cea76d38bff4664ef75a49d9dce22a40708389469d099c41c91b9fd32142356e8b9779ba2623739a59318fbf43b12a211b9285481  kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-ppc64le.tar.gz"
-ENV KAFKA_EXPORTER_CHECKSUM_S390X="7a80e10d08ebeeccb968c2c58db7886d1778eb1e9ea5130f88ef7379d8018499b9fef79ae416b7a312b165fd76fd3680bed984041cb8be9ec198f694ab37b5ff kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-s390x.tar.gz"
+ENV KAFKA_EXPORTER_VERSION=1.8.0
+ENV KAFKA_EXPORTER_CHECKSUM_AMD64="bb38dc2c0ce0dcbcf208beab0d75f323e05595486b43dd7d0d478c858621fec828d6070099b3972ac56b5adeaab34947ecf0947b8b3c4f6f8085af1b28043268  kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-amd64.tar.gz"
+ENV KAFKA_EXPORTER_CHECKSUM_ARM64="d5b1a8e351c75fc1bd0b6222ce96022558e7d039b99788471ba93a3825b8afe69a9cf9d2856d871a4707ddc62f50fa29b34a9a976077c505a1c26ff22678ac41  kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-arm64.tar.gz"
+ENV KAFKA_EXPORTER_CHECKSUM_PPC64LE="33d6a757536e09926c05ca750c36ffb7f2bf23f864c8172293d0c51ab4928f091c41216e9bfe967b3f496f338bcc3a73d1ca457fe213bc06725f566f636d6c39  kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-ppc64le.tar.gz"
+ENV KAFKA_EXPORTER_CHECKSUM_S390X="5dc868e15971017a79576856865bdca13fc3ac638ef7802390ead7acf06e69a0f1423b439a812fb026a0fcfd9ffc2e581af2729850de3509d335b5b5dca0d869 kafka_exporter-${KAFKA_EXPORTER_VERSION}.linux-s390x.tar.gz"
 
 RUN set -ex; \
     if [[ "${TARGETOS}/${TARGETARCH}" = "linux/arm64" ]]; then \
diff --git a/packaging/examples/metrics/grafana-dashboards/strimzi-kafka-exporter.json b/packaging/examples/metrics/grafana-dashboards/strimzi-kafka-exporter.json
index 92e1da9899..20a78fd36c 100644
--- a/packaging/examples/metrics/grafana-dashboards/strimzi-kafka-exporter.json
+++ b/packaging/examples/metrics/grafana-dashboards/strimzi-kafka-exporter.json
@@ -1520,7 +1520,7 @@
         "multi": false,
         "name": "kubernetes_namespace",
         "options": [],
-        "query": "query_result(kafka_exporter_build_info)",
+        "query": "query_result(kafka_broker_info)",
         "refresh": 1,
         "regex": "/.*namespace=\"([^\"]*).*/",
         "skipUrlSync": false,
@@ -1540,7 +1540,7 @@
         "multi": false,
         "name": "strimzi_cluster_name",
         "options": [],
-        "query": "query_result(kafka_exporter_build_info{namespace=\"$kubernetes_namespace\"})",
+        "query": "query_result(kafka_broker_info{namespace=\"$kubernetes_namespace\"})",
         "refresh": 1,
         "regex": "/.*strimzi_io_cluster=\"([^\"]*).*/",
         "skipUrlSync": false,
diff --git a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-exporter.json b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-exporter.json
index 92e1da9899..20a78fd36c 100644
--- a/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-exporter.json
+++ b/packaging/helm-charts/helm3/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-exporter.json
@@ -1520,7 +1520,7 @@
         "multi": false,
         "name": "kubernetes_namespace",
         "options": [],
-        "query": "query_result(kafka_exporter_build_info)",
+        "query": "query_result(kafka_broker_info)",
         "refresh": 1,
         "regex": "/.*namespace=\"([^\"]*).*/",
         "skipUrlSync": false,
@@ -1540,7 +1540,7 @@
         "multi": false,
         "name": "strimzi_cluster_name",
         "options": [],
-        "query": "query_result(kafka_exporter_build_info{namespace=\"$kubernetes_namespace\"})",
+        "query": "query_result(kafka_broker_info{namespace=\"$kubernetes_namespace\"})",
         "refresh": 1,
         "regex": "/.*strimzi_io_cluster=\"([^\"]*).*/",
         "skipUrlSync": false,