diff --git a/bitnami/kafka/CHANGELOG.md b/bitnami/kafka/CHANGELOG.md
index a59f0e82d4388a..b0ba6474b8545d 100644
--- a/bitnami/kafka/CHANGELOG.md
+++ b/bitnami/kafka/CHANGELOG.md
@@ -1,8 +1,13 @@
 # Changelog
 
-## 29.3.5 (2024-07-01)
+## 29.3.6 (2024-07-02)
 
-* [bitnami/kafka] Release 29.3.5 ([#27613](https://github.com/bitnami/charts/pull/27613))
+* [bitnami/kafka] fix: Mount kafka_jaas.conf in controller statefulset for kraft migration ([#27610](https://github.com/bitnami/charts/pull/27610))
+
+## <small>29.3.5 (2024-07-01)</small>
+
+* [bitnami/*] Update README changing TAC wording (#27530) ([52dfed6](https://github.com/bitnami/charts/commit/52dfed6bac44d791efabfaf06f15daddc4fefb0c)), closes [#27530](https://github.com/bitnami/charts/issues/27530)
+* [bitnami/kafka] Release 29.3.5 (#27613) ([1ef0ca8](https://github.com/bitnami/charts/commit/1ef0ca867542f99b4e37ac3182727357a0fd17cf)), closes [#27613](https://github.com/bitnami/charts/issues/27613)
 
 ## <small>29.3.4 (2024-06-18)</small>
 
diff --git a/bitnami/kafka/Chart.yaml b/bitnami/kafka/Chart.yaml
index dc6f70a46fd14d..0f3b69dbe63926 100644
--- a/bitnami/kafka/Chart.yaml
+++ b/bitnami/kafka/Chart.yaml
@@ -40,4 +40,4 @@ maintainers:
 name: kafka
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/kafka
-version: 29.3.5
+version: 29.3.6
diff --git a/bitnami/kafka/templates/controller-eligible/statefulset.yaml b/bitnami/kafka/templates/controller-eligible/statefulset.yaml
index 0b2bb88ff891bb..3320509fe7a1db 100644
--- a/bitnami/kafka/templates/controller-eligible/statefulset.yaml
+++ b/bitnami/kafka/templates/controller-eligible/statefulset.yaml
@@ -310,6 +310,11 @@ spec:
             - name: kafka-config
               mountPath: /opt/bitnami/kafka/config/server.properties
               subPath: server.properties
+            {{- if .Values.sasl.zookeeper.user }}
+            - name: kafka-config
+              mountPath: /opt/bitnami/kafka/config/kafka_jaas.conf
+              subPath: kafka_jaas.conf
+            {{- end }}
             - name: tmp
               mountPath: /tmp
             {{- if or .Values.log4j .Values.existingLog4jConfigMap }}