diff --git a/bitnami/kafka/4.1/debian-12/Dockerfile b/bitnami/kafka/4.1/debian-12/Dockerfile
index 5c42980067d9..104e223bd95d 100644
--- a/bitnami/kafka/4.1/debian-12/Dockerfile
+++ b/bitnami/kafka/4.1/debian-12/Dockerfile
@@ -8,7 +8,7 @@ ARG JAVA_EXTRA_SECURITY_DIR="/bitnami/java/extra-security"
 ARG TARGETARCH
 
 LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-11-21T08:24:03Z" \
+      org.opencontainers.image.created="2025-12-09T13:16:38Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/kafka/README.md" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/kafka" \
@@ -53,7 +53,7 @@ RUN /opt/bitnami/scripts/java/postunpack.sh
 RUN /opt/bitnami/scripts/kafka/postunpack.sh
 ENV APP_VERSION="4.1.1" \
     BITNAMI_APP_NAME="kafka" \
-    IMAGE_REVISION="2" \
+    IMAGE_REVISION="3" \
     JAVA_HOME="/opt/bitnami/java" \
     PATH="/opt/bitnami/java/bin:/opt/bitnami/kafka/bin:$PATH"
 
diff --git a/bitnami/kafka/4.1/debian-12/rootfs/opt/bitnami/scripts/libkafka.sh b/bitnami/kafka/4.1/debian-12/rootfs/opt/bitnami/scripts/libkafka.sh
index d4304eebab0a..503808f081a5 100644
--- a/bitnami/kafka/4.1/debian-12/rootfs/opt/bitnami/scripts/libkafka.sh
+++ b/bitnami/kafka/4.1/debian-12/rootfs/opt/bitnami/scripts/libkafka.sh
@@ -896,7 +896,7 @@ kafka_kraft_storage_initialize() {
             args+=("--add-scram" "SCRAM-SHA-512=[name=${KAFKA_CONTROLLER_USER},password=${KAFKA_CONTROLLER_PASSWORD}]")
         fi
     fi
-    if ! kafka_is_zookeeper_supported && [[ "${KAFKA_CFG_PROCESS_ROLES:-}" =~ "controller" ]]; then
+    if [[ "${KAFKA_CFG_PROCESS_ROLES:-}" =~ "controller" ]]; then
         args+=("--feature=kraft.version=1")
         if [[ -n "${KAFKA_INITIAL_CONTROLLERS:-}" ]]; then
             args+=("--initial-controllers=${KAFKA_INITIAL_CONTROLLERS}")
@@ -906,7 +906,9 @@ kafka_kraft_storage_initialize() {
     fi
 
     info "Formatting storage directories to add metadata..."
-    debug_execute "${KAFKA_HOME}/bin/kafka-storage.sh" format "${args[@]}"
+    cmd=("${KAFKA_HOME}/bin/kafka-storage.sh" "format")
+    am_i_root && cmd=("run_as_user" "$KAFKA_DAEMON_USER" "${cmd[@]}")
+    debug_execute "${cmd[@]}" "${args[@]}"
 }
 
 ########################