diff --git a/bitnami/kafka/README.md b/bitnami/kafka/README.md
index 71c15796b..7c1f099ae 100644
--- a/bitnami/kafka/README.md
+++ b/bitnami/kafka/README.md
@@ -100,7 +100,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `logRetentionCheckIntervalMs`                     | The interval at which log segments are checked to see if they can be deleted                                                                                                        | `300000`                            |
 | `logRetentionHours`                               | The minimum age of a log file to be eligible for deletion due to age                                                                                                                | `168`                               |
 | `logSegmentBytes`                                 | The maximum size of a log segment file. When this size is reached a new log segment will be created                                                                                 | `_1073741824`                       |
-| `logsDirs`                                        | A comma separated list of directories under which to store log files                                                                                                                | `/bitnami/kafka/data`               |
+| `logsDirs`                                        | A comma separated list of directories under which to store log files                                                                                                                | `/opt/bitnami/kafka/logs`           |
 | `maxMessageBytes`                                 | The largest record batch size allowed by Kafka                                                                                                                                      | `_1000012`                          |
 | `defaultReplicationFactor`                        | Default replication factors for automatically created topics                                                                                                                        | `1`                                 |
 | `offsetsTopicReplicationFactor`                   | The replication factor for the offsets topic                                                                                                                                        | `1`                                 |
diff --git a/bitnami/kafka/templates/scripts-configmap.yaml b/bitnami/kafka/templates/scripts-configmap.yaml
index 1fc3ee055..067a49b11 100644
--- a/bitnami/kafka/templates/scripts-configmap.yaml
+++ b/bitnami/kafka/templates/scripts-configmap.yaml
@@ -76,8 +76,8 @@ data:
     #!/bin/bash
 
     ID="${MY_POD_NAME#"{{ $fullname }}-"}"
-    if [[ -f "/bitnami/kafka/data/meta.properties" ]]; then
-        export KAFKA_CFG_BROKER_ID="$(grep "broker.id" /bitnami/kafka/data/meta.properties | awk -F '=' '{print $2}')"
+    if [[ -f "/bitnami/kafka/logs/meta.properties" ]]; then
+        export KAFKA_CFG_BROKER_ID="$(grep "broker.id" /bitnami/kafka/logs/meta.properties | awk -F '=' '{print $2}')"
     else
         export KAFKA_CFG_BROKER_ID="$((ID + {{ .Values.minBrokerId }}))"
     fi
diff --git a/bitnami/kafka/values.yaml b/bitnami/kafka/values.yaml
index 4220ed19c..260fb0454 100644
--- a/bitnami/kafka/values.yaml
+++ b/bitnami/kafka/values.yaml
@@ -159,7 +159,7 @@ logRetentionHours: 168
 logSegmentBytes: _1073741824
 ## @param logsDirs A comma separated list of directories under which to store log files
 ##
-logsDirs: /bitnami/kafka/data
+logsDirs: /opt/bitnami/kafka/logs
 ## @param maxMessageBytes The largest record batch size allowed by Kafka
 ##
 maxMessageBytes: _1000012