diff --git a/.vib/kafka/goss/goss.yaml b/.vib/kafka/goss/goss.yaml
index dfa2ec36b9..854a43c948 100644
--- a/.vib/kafka/goss/goss.yaml
+++ b/.vib/kafka/goss/goss.yaml
@@ -10,7 +10,7 @@ file:
   {{ .Vars.controller.logPersistence.mountPath }}:
     exists: true
     filetype: directory
-    mode: "2777"
+    mode: "2775"
     owner: root
   /opt/bitnami/kafka/config/server.properties:
     exists: true
diff --git a/.vib/kafka/runtime-parameters.yaml b/.vib/kafka/runtime-parameters.yaml
index a8b7ee4ca7..953241652b 100644
--- a/.vib/kafka/runtime-parameters.yaml
+++ b/.vib/kafka/runtime-parameters.yaml
@@ -26,6 +26,7 @@ service:
     interbroker: 19094
 controller:
   logPersistence:
+    enabled: true
     mountPath: /opt/bitnami/kafka/logs
   persistence:
     mountPath: /bitnami/kafka
diff --git a/bitnami/kafka/Chart.yaml b/bitnami/kafka/Chart.yaml
index 91e4b877f0..43afd90e2b 100644
--- a/bitnami/kafka/Chart.yaml
+++ b/bitnami/kafka/Chart.yaml
@@ -42,4 +42,4 @@ maintainers:
 name: kafka
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/kafka
-version: 26.6.0
+version: 26.6.1
diff --git a/bitnami/kafka/templates/_helpers.tpl b/bitnami/kafka/templates/_helpers.tpl
index ef87dda46f..85b35865b8 100644
--- a/bitnami/kafka/templates/_helpers.tpl
+++ b/bitnami/kafka/templates/_helpers.tpl
@@ -598,7 +598,6 @@ Returns the controller quorum voters based on the number of controller-eligible
 Section of the server.properties configmap shared by both controller-eligible and broker nodes
 */}}
 {{- define "kafka.commonConfig" -}}
-log.dir={{ printf "%s/data" .Values.controller.persistence.mountPath }}
 {{- if or (include "kafka.saslEnabled" .) }}
 sasl.enabled.mechanisms={{ upper .Values.sasl.enabledMechanisms }}
 {{- end }}
diff --git a/bitnami/kafka/templates/broker/configmap.yaml b/bitnami/kafka/templates/broker/configmap.yaml
index 12a231c9f2..4d46945554 100644
--- a/bitnami/kafka/templates/broker/configmap.yaml
+++ b/bitnami/kafka/templates/broker/configmap.yaml
@@ -40,6 +40,10 @@ data:
     inter.broker.protocol.version={{ default (regexFind "^[0-9].[0-9]+" .Chart.AppVersion) .Values.interBrokerProtocolVersion }}
     {{- end }}
     {{- end }}
+    # Kafka data logs directory
+    log.dir={{ printf "%s/data" .Values.broker.persistence.mountPath }}
+    # Kafka application logs directory
+    logs.dir={{ .Values.broker.logPersistence.mountPath }}
     {{- include "kafka.commonConfig" . | nindent 4 }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.extraConfig "context" $ ) | nindent 4 }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.broker.extraConfig "context" $ ) | nindent 4 }}
diff --git a/bitnami/kafka/templates/controller-eligible/configmap.yaml b/bitnami/kafka/templates/controller-eligible/configmap.yaml
index ed77b65331..4f8d79f832 100644
--- a/bitnami/kafka/templates/controller-eligible/configmap.yaml
+++ b/bitnami/kafka/templates/controller-eligible/configmap.yaml
@@ -39,6 +39,10 @@ data:
     inter.broker.protocol.version={{ default (regexFind "^[0-9].[0-9]+" .Chart.AppVersion) .Values.interBrokerProtocolVersion }}
     {{- include "kafka.zookeeperConfig" . | nindent 4 }}
     {{- end }}
+    # Kafka data logs directory
+    log.dir={{ printf "%s/data" .Values.controller.persistence.mountPath }}
+    # Kafka application logs directory
+    logs.dir={{ .Values.controller.logPersistence.mountPath }}
     {{- include "kafka.commonConfig" . | nindent 4 }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.extraConfig "context" $ ) | nindent 4 }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.controller.extraConfig "context" $ ) | nindent 4 }}