diff --git a/bitnami/kafka/CHANGELOG.md b/bitnami/kafka/CHANGELOG.md
index f0a2a9db80..53e0acfbce 100644
--- a/bitnami/kafka/CHANGELOG.md
+++ b/bitnami/kafka/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 32.3.9 (2025-07-28)
+## 32.3.10 (2025-08-01)
 
-* [bitnami/kafka] Fix provisioning postScript ([#35310](https://github.com/bitnami/charts/pull/35310))
+* [bitnami/kafka] Fix component labels of controller to 'controller-eligible' ([#35200](https://github.com/bitnami/charts/pull/35200))
+
+## <small>32.3.9 (2025-07-29)</small>
+
+* [bitnami/kafka] Fix provisioning postScript (#35310) ([c5b2cd2](https://github.com/bitnami/charts/commit/c5b2cd2d2ebf0bb50d944e79303438252be34c7a)), closes [#35310](https://github.com/bitnami/charts/issues/35310)
 
 ## <small>32.3.8 (2025-07-25)</small>
 
diff --git a/bitnami/kafka/Chart.yaml b/bitnami/kafka/Chart.yaml
index e6511c635f..84bf745bab 100644
--- a/bitnami/kafka/Chart.yaml
+++ b/bitnami/kafka/Chart.yaml
@@ -38,4 +38,4 @@ maintainers:
 name: kafka
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/kafka
-version: 32.3.9
+version: 32.3.10
diff --git a/bitnami/kafka/templates/controller-eligible/hpa.yaml b/bitnami/kafka/templates/controller-eligible/hpa.yaml
index 340950fe58..84c152df84 100644
--- a/bitnami/kafka/templates/controller-eligible/hpa.yaml
+++ b/bitnami/kafka/templates/controller-eligible/hpa.yaml
@@ -10,7 +10,7 @@ metadata:
   name: {{ template "kafka.controller.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: controller
+    app.kubernetes.io/component: controller-eligible
     app.kubernetes.io/part-of: kafka
   {{- if or .Values.controller.autoscaling.hpa.annotations .Values.commonAnnotations }}
   {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.controller.autoscaling.hpa.annotations .Values.commonAnnotations ) "context" . ) }}
diff --git a/bitnami/kafka/templates/controller-eligible/networkpolicy.yaml b/bitnami/kafka/templates/controller-eligible/networkpolicy.yaml
index 501a2be06b..847d4fe913 100644
--- a/bitnami/kafka/templates/controller-eligible/networkpolicy.yaml
+++ b/bitnami/kafka/templates/controller-eligible/networkpolicy.yaml
@@ -10,7 +10,7 @@ metadata:
   name: {{ template "kafka.controller.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: controller
+    app.kubernetes.io/component: controller-eligible
     app.kubernetes.io/part-of: kafka
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
@@ -19,7 +19,7 @@ spec:
   {{- $podLabels := include "common.tplvalues.merge" ( dict "values" ( list .Values.controller.podLabels .Values.commonLabels ) "context" . ) }}
   podSelector:
     matchLabels: {{- include "common.labels.matchLabels" ( dict "customLabels" $podLabels "context" $ ) | nindent 6 }}
-      app.kubernetes.io/component: controller
+      app.kubernetes.io/component: controller-eligible
       app.kubernetes.io/part-of: kafka
   policyTypes:
     - Ingress
diff --git a/bitnami/kafka/templates/controller-eligible/vpa.yaml b/bitnami/kafka/templates/controller-eligible/vpa.yaml
index 76abb70239..2a33c17700 100644
--- a/bitnami/kafka/templates/controller-eligible/vpa.yaml
+++ b/bitnami/kafka/templates/controller-eligible/vpa.yaml
@@ -10,7 +10,7 @@ metadata:
   name: {{ template "kafka.controller.fullname" . }}
   namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
-    app.kubernetes.io/component: controller
+    app.kubernetes.io/component: controller-eligible
     app.kubernetes.io/part-of: kafka
   {{- if or .Values.controller.autoscaling.vpa.annotations .Values.commonAnnotations }}
   {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.controller.autoscaling.vpa.annotations .Values.commonAnnotations ) "context" . ) }}