diff --git a/bitnami/kafka/2.8/debian-10/rootfs/opt/bitnami/scripts/kafka-env.sh b/bitnami/kafka/2.8/debian-10/rootfs/opt/bitnami/scripts/kafka-env.sh
index 7c55be56b684..614f175331f5 100644
--- a/bitnami/kafka/2.8/debian-10/rootfs/opt/bitnami/scripts/kafka-env.sh
+++ b/bitnami/kafka/2.8/debian-10/rootfs/opt/bitnami/scripts/kafka-env.sh
@@ -39,7 +39,7 @@ kafka_env_vars=(
     KAFKA_CFG_MAX_REQUEST_SIZE
     KAFKA_CFG_MAX_PARTITION_FETCH_BYTES
     KAFKA_ENABLE_KRAFT
-    KAFKA_CLUSTER_ID
+    KAFKA_KRAFT_CLUSTER_ID
     KAFKA_ZOOKEEPER_PROTOCOL
     KAFKA_ZOOKEEPER_PASSWORD
     KAFKA_ZOOKEEPER_USER
@@ -101,10 +101,8 @@ export KAFKA_CFG_SASL_ENABLED_MECHANISMS="${KAFKA_CFG_SASL_ENABLED_MECHANISMS:-P
 export KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL="${KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL:-}"
 export KAFKA_CFG_MAX_REQUEST_SIZE="${KAFKA_CFG_MAX_REQUEST_SIZE:-1048576}"
 export KAFKA_CFG_MAX_PARTITION_FETCH_BYTES="${KAFKA_CFG_MAX_PARTITION_FETCH_BYTES:-1048576}"
-
-# Kraft settings
-export KAFKA_ENABLE_KRAFT="${KAFKA_ENABLE_KRAFT:-}"
-export KAFKA_CLUSTER_ID="${KAFKA_CLUSTER_ID:-}"
+export KAFKA_ENABLE_KRAFT="${KAFKA_ENABLE_KRAFT:-no}"
+export KAFKA_KRAFT_CLUSTER_ID="${KAFKA_KRAFT_CLUSTER_ID:-}"
 
 # ZooKeeper connection settings
 export KAFKA_ZOOKEEPER_PROTOCOL="${KAFKA_ZOOKEEPER_PROTOCOL:-PLAINTEXT}"
diff --git a/bitnami/kafka/2.8/debian-10/rootfs/opt/bitnami/scripts/kafka/setup.sh b/bitnami/kafka/2.8/debian-10/rootfs/opt/bitnami/scripts/kafka/setup.sh
index a57688e1b131..5b93530ade9a 100755
--- a/bitnami/kafka/2.8/debian-10/rootfs/opt/bitnami/scripts/kafka/setup.sh
+++ b/bitnami/kafka/2.8/debian-10/rootfs/opt/bitnami/scripts/kafka/setup.sh
@@ -21,7 +21,7 @@ if [[ -z "${KAFKA_CFG_BROKER_ID:-}" ]]; then
     if [[ -n "${BROKER_ID_COMMAND:-}" ]]; then
         KAFKA_CFG_BROKER_ID="$(eval "${BROKER_ID_COMMAND:-}")"
         export KAFKA_CFG_BROKER_ID
-    elif [[ -z "$KAFKA_ENABLE_KRAFT" ]]; then
+    elif ! is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
         # By default auto allocate broker ID unless KRaft is enabled
         export KAFKA_CFG_BROKER_ID=-1
     fi
diff --git a/bitnami/kafka/2.8/debian-10/rootfs/opt/bitnami/scripts/libkafka.sh b/bitnami/kafka/2.8/debian-10/rootfs/opt/bitnami/scripts/libkafka.sh
index 41163ed2c653..1d7722c44124 100644
--- a/bitnami/kafka/2.8/debian-10/rootfs/opt/bitnami/scripts/libkafka.sh
+++ b/bitnami/kafka/2.8/debian-10/rootfs/opt/bitnami/scripts/libkafka.sh
@@ -238,7 +238,7 @@ kafka_validate() {
         fi
     }
 
-    if [[ -n "$KAFKA_ENABLE_KRAFT" ]]; then
+    if is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
         if [[ -n "$KAFKA_CFG_BROKER_ID" ]]; then
             warn "KAFKA_CFG_BROKER_ID Must match what is set in KAFKA_CFG_CONTROLLER_QUORUM_VOTERS"
         else
@@ -731,14 +731,14 @@ kafka_configure_producer_consumer_message_sizes() {
 kraft_initialize() {
     info "Initializing KRaft..."
 
-    if [[ -z "$KAFKA_CLUSTER_ID" ]]; then
-        warn "KAFKA_CLUSTER_ID not set - If using multiple nodes then you must use the same Cluster ID for each one"
-        KAFKA_CLUSTER_ID="$($KAFKA_HOME/bin/kafka-storage.sh random-uuid)"
-        info "Generated Kafka cluster ID '${KAFKA_CLUSTER_ID}'"
+    if [[ -z "$KAFKA_KRAFT_CLUSTER_ID" ]]; then
+        warn "KAFKA_KRAFT_CLUSTER_ID not set - If using multiple nodes then you must use the same Cluster ID for each one"
+        KAFKA_KRAFT_CLUSTER_ID="$("${KAFKA_HOME}/bin/kafka-storage.sh" random-uuid)"
+        info "Generated Kafka cluster ID '${KAFKA_KRAFT_CLUSTER_ID}'"
     fi
 
     info "Formatting storage directories to add metadata..."
-    debug_execute "$KAFKA_HOME/bin/kafka-storage.sh" format --config ${KAFKA_CONF_FILE} --cluster-id ${KAFKA_CLUSTER_ID} --ignore-formatted
+    debug_execute "$KAFKA_HOME/bin/kafka-storage.sh" format --config "$KAFKA_CONF_FILE" --cluster-id "$KAFKA_KRAFT_CLUSTER_ID" --ignore-formatted
 }
 
 ########################
diff --git a/bitnami/kafka/README.md b/bitnami/kafka/README.md
index 41b4cb501fec..a90211173fca 100644
--- a/bitnami/kafka/README.md
+++ b/bitnami/kafka/README.md
@@ -43,7 +43,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 * [`3.1`, `3.1-debian-10`, `3.1.0`, `3.1.0-debian-10-r89`, `latest` (3.1/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kafka/blob/3.1.0-debian-10-r89/3.1/debian-10/Dockerfile)
 * [`3.0`, `3.0-debian-10`, `3.0.1`, `3.0.1-debian-10-r34` (3.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kafka/blob/3.0.1-debian-10-r34/3.0/debian-10/Dockerfile)
-* [`2.8`, `2.8-debian-10`, `2.8.1`, `2.8.1-debian-10-r199` (2.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kafka/blob/2.8.1-debian-10-r199/2.8/debian-10/Dockerfile)
+* [`2.8`, `2.8-debian-10`, `2.8.1`, `2.8.1-debian-10-r200` (2.8/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-kafka/blob/2.8.1-debian-10-r200/2.8/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/kafka GitHub repo](https://github.com/bitnami/bitnami-docker-kafka).