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 1d7722c44124..d45ed880b0b5 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
@@ -303,28 +303,30 @@ kafka_validate() {
     elif ! is_boolean_yes "$ALLOW_PLAINTEXT_LISTENER"; then
         print_validation_error "The KAFKA_CFG_LISTENERS environment variable does not configure a secure listener. Set the environment variable ALLOW_PLAINTEXT_LISTENER=yes to allow the container to be started with a plaintext listener. This is only recommended for development."
     fi
-    if [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SSL ]]; then
-        if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
-            [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
-            print_validation_error "In order to configure the TLS encryption for Zookeeper with JKS certs you must mount your zookeeper.truststore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-        elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
-            [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
-            print_validation_error "In order to configure the TLS encryption for Zookeeper with PEM certs you must mount your zookeeper.truststore.pem cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+    if ! is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
+        if [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SSL ]]; then
+            if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
+                [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
+                print_validation_error "In order to configure the TLS encryption for Zookeeper with JKS certs you must mount your zookeeper.truststore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+            elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
+                [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
+                print_validation_error "In order to configure the TLS encryption for Zookeeper with PEM certs you must mount your zookeeper.truststore.pem cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+            fi
+            if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
+                [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.jks" ]] && [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.jks" ]]; then
+                warn "In order to configure the mTLS for Zookeeper with JKS certs you must mount your zookeeper.keystore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+            elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
+                { [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.key" ]]; } &&
+                { [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.key" ]]; }; then
+                warn "In order to configure the mTLS for Zookeeper with PEM certs you must mount your zookeeper.keystore.pem cert and zookeeper.keystore.key key to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+            fi
+        elif [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SASL ]]; then
+            if [[ -z "$KAFKA_ZOOKEEPER_USER" ]] || [[ -z "$KAFKA_ZOOKEEPER_PASSWORD" ]]; then
+                print_validation_error "In order to configure SASL authentication for Kafka, you must provide the SASL credentials. Set the environment variables KAFKA_ZOOKEEPER_USER and KAFKA_ZOOKEEPER_PASSWORD, to configure the credentials for SASL authentication with Zookeeper."
+            fi
+        elif ! is_boolean_yes "$ALLOW_PLAINTEXT_LISTENER"; then
+            print_validation_error "The KAFKA_ZOOKEEPER_PROTOCOL environment variable does not configure a secure protocol. Set the environment variable ALLOW_PLAINTEXT_LISTENER=yes to allow the container to be started with a plaintext listener. This is only recommended for development."
         fi
-        if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
-            [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.jks" ]] && [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.jks" ]]; then
-            warn "In order to configure the mTLS for Zookeeper with JKS certs you must mount your zookeeper.keystore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-        elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
-            { [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.key" ]]; } &&
-            { [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.key" ]]; }; then
-            warn "In order to configure the mTLS for Zookeeper with PEM certs you must mount your zookeeper.keystore.pem cert and zookeeper.keystore.key key to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-        fi
-    elif [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SASL ]]; then
-        if [[ -z "$KAFKA_ZOOKEEPER_USER" ]] || [[ -z "$KAFKA_ZOOKEEPER_PASSWORD" ]]; then
-            print_validation_error "In order to configure SASL authentication for Kafka, you must provide the SASL credentials. Set the environment variables KAFKA_ZOOKEEPER_USER and KAFKA_ZOOKEEPER_PASSWORD, to configure the credentials for SASL authentication with Zookeeper."
-        fi
-    elif ! is_boolean_yes "$ALLOW_PLAINTEXT_LISTENER"; then
-        print_validation_error "The KAFKA_ZOOKEEPER_PROTOCOL environment variable does not configure a secure protocol. Set the environment variable ALLOW_PLAINTEXT_LISTENER=yes to allow the container to be started with a plaintext listener. This is only recommended for development."
     fi
     check_multi_value "KAFKA_TLS_TYPE" "JKS PEM"
     check_multi_value "KAFKA_ZOOKEEPER_TLS_TYPE" "JKS PEM"
diff --git a/bitnami/kafka/3.0/debian-10/rootfs/opt/bitnami/scripts/libkafka.sh b/bitnami/kafka/3.0/debian-10/rootfs/opt/bitnami/scripts/libkafka.sh
index 1d7722c44124..d45ed880b0b5 100644
--- a/bitnami/kafka/3.0/debian-10/rootfs/opt/bitnami/scripts/libkafka.sh
+++ b/bitnami/kafka/3.0/debian-10/rootfs/opt/bitnami/scripts/libkafka.sh
@@ -303,28 +303,30 @@ kafka_validate() {
     elif ! is_boolean_yes "$ALLOW_PLAINTEXT_LISTENER"; then
         print_validation_error "The KAFKA_CFG_LISTENERS environment variable does not configure a secure listener. Set the environment variable ALLOW_PLAINTEXT_LISTENER=yes to allow the container to be started with a plaintext listener. This is only recommended for development."
     fi
-    if [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SSL ]]; then
-        if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
-            [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
-            print_validation_error "In order to configure the TLS encryption for Zookeeper with JKS certs you must mount your zookeeper.truststore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-        elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
-            [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
-            print_validation_error "In order to configure the TLS encryption for Zookeeper with PEM certs you must mount your zookeeper.truststore.pem cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+    if ! is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
+        if [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SSL ]]; then
+            if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
+                [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
+                print_validation_error "In order to configure the TLS encryption for Zookeeper with JKS certs you must mount your zookeeper.truststore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+            elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
+                [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
+                print_validation_error "In order to configure the TLS encryption for Zookeeper with PEM certs you must mount your zookeeper.truststore.pem cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+            fi
+            if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
+                [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.jks" ]] && [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.jks" ]]; then
+                warn "In order to configure the mTLS for Zookeeper with JKS certs you must mount your zookeeper.keystore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+            elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
+                { [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.key" ]]; } &&
+                { [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.key" ]]; }; then
+                warn "In order to configure the mTLS for Zookeeper with PEM certs you must mount your zookeeper.keystore.pem cert and zookeeper.keystore.key key to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+            fi
+        elif [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SASL ]]; then
+            if [[ -z "$KAFKA_ZOOKEEPER_USER" ]] || [[ -z "$KAFKA_ZOOKEEPER_PASSWORD" ]]; then
+                print_validation_error "In order to configure SASL authentication for Kafka, you must provide the SASL credentials. Set the environment variables KAFKA_ZOOKEEPER_USER and KAFKA_ZOOKEEPER_PASSWORD, to configure the credentials for SASL authentication with Zookeeper."
+            fi
+        elif ! is_boolean_yes "$ALLOW_PLAINTEXT_LISTENER"; then
+            print_validation_error "The KAFKA_ZOOKEEPER_PROTOCOL environment variable does not configure a secure protocol. Set the environment variable ALLOW_PLAINTEXT_LISTENER=yes to allow the container to be started with a plaintext listener. This is only recommended for development."
         fi
-        if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
-            [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.jks" ]] && [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.jks" ]]; then
-            warn "In order to configure the mTLS for Zookeeper with JKS certs you must mount your zookeeper.keystore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-        elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
-            { [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.key" ]]; } &&
-            { [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.key" ]]; }; then
-            warn "In order to configure the mTLS for Zookeeper with PEM certs you must mount your zookeeper.keystore.pem cert and zookeeper.keystore.key key to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-        fi
-    elif [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SASL ]]; then
-        if [[ -z "$KAFKA_ZOOKEEPER_USER" ]] || [[ -z "$KAFKA_ZOOKEEPER_PASSWORD" ]]; then
-            print_validation_error "In order to configure SASL authentication for Kafka, you must provide the SASL credentials. Set the environment variables KAFKA_ZOOKEEPER_USER and KAFKA_ZOOKEEPER_PASSWORD, to configure the credentials for SASL authentication with Zookeeper."
-        fi
-    elif ! is_boolean_yes "$ALLOW_PLAINTEXT_LISTENER"; then
-        print_validation_error "The KAFKA_ZOOKEEPER_PROTOCOL environment variable does not configure a secure protocol. Set the environment variable ALLOW_PLAINTEXT_LISTENER=yes to allow the container to be started with a plaintext listener. This is only recommended for development."
     fi
     check_multi_value "KAFKA_TLS_TYPE" "JKS PEM"
     check_multi_value "KAFKA_ZOOKEEPER_TLS_TYPE" "JKS PEM"
diff --git a/bitnami/kafka/3.1/debian-10/rootfs/opt/bitnami/scripts/libkafka.sh b/bitnami/kafka/3.1/debian-10/rootfs/opt/bitnami/scripts/libkafka.sh
index 1d7722c44124..d45ed880b0b5 100644
--- a/bitnami/kafka/3.1/debian-10/rootfs/opt/bitnami/scripts/libkafka.sh
+++ b/bitnami/kafka/3.1/debian-10/rootfs/opt/bitnami/scripts/libkafka.sh
@@ -303,28 +303,30 @@ kafka_validate() {
     elif ! is_boolean_yes "$ALLOW_PLAINTEXT_LISTENER"; then
         print_validation_error "The KAFKA_CFG_LISTENERS environment variable does not configure a secure listener. Set the environment variable ALLOW_PLAINTEXT_LISTENER=yes to allow the container to be started with a plaintext listener. This is only recommended for development."
     fi
-    if [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SSL ]]; then
-        if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
-            [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
-            print_validation_error "In order to configure the TLS encryption for Zookeeper with JKS certs you must mount your zookeeper.truststore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-        elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
-            [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
-            print_validation_error "In order to configure the TLS encryption for Zookeeper with PEM certs you must mount your zookeeper.truststore.pem cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+    if ! is_boolean_yes "$KAFKA_ENABLE_KRAFT"; then
+        if [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SSL ]]; then
+            if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
+                [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
+                print_validation_error "In order to configure the TLS encryption for Zookeeper with JKS certs you must mount your zookeeper.truststore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+            elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
+                [[ ! -f "$KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_FILE" ]]; then
+                print_validation_error "In order to configure the TLS encryption for Zookeeper with PEM certs you must mount your zookeeper.truststore.pem cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+            fi
+            if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
+                [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.jks" ]] && [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.jks" ]]; then
+                warn "In order to configure the mTLS for Zookeeper with JKS certs you must mount your zookeeper.keystore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+            elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
+                { [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.key" ]]; } &&
+                { [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.key" ]]; }; then
+                warn "In order to configure the mTLS for Zookeeper with PEM certs you must mount your zookeeper.keystore.pem cert and zookeeper.keystore.key key to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
+            fi
+        elif [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SASL ]]; then
+            if [[ -z "$KAFKA_ZOOKEEPER_USER" ]] || [[ -z "$KAFKA_ZOOKEEPER_PASSWORD" ]]; then
+                print_validation_error "In order to configure SASL authentication for Kafka, you must provide the SASL credentials. Set the environment variables KAFKA_ZOOKEEPER_USER and KAFKA_ZOOKEEPER_PASSWORD, to configure the credentials for SASL authentication with Zookeeper."
+            fi
+        elif ! is_boolean_yes "$ALLOW_PLAINTEXT_LISTENER"; then
+            print_validation_error "The KAFKA_ZOOKEEPER_PROTOCOL environment variable does not configure a secure protocol. Set the environment variable ALLOW_PLAINTEXT_LISTENER=yes to allow the container to be started with a plaintext listener. This is only recommended for development."
         fi
-        if [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "JKS" ]] &&
-            [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.jks" ]] && [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.jks" ]]; then
-            warn "In order to configure the mTLS for Zookeeper with JKS certs you must mount your zookeeper.keystore.jks cert to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-        elif [[ "$KAFKA_ZOOKEEPER_TLS_TYPE" = "PEM" ]] &&
-            { [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_CERTS_DIR}/zookeeper.keystore.key" ]]; } &&
-            { [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.pem" ]] || [[ ! -f "${KAFKA_MOUNTED_CONF_DIR}/certs/zookeeper.keystore.key" ]]; }; then
-            warn "In order to configure the mTLS for Zookeeper with PEM certs you must mount your zookeeper.keystore.pem cert and zookeeper.keystore.key key to the ${KAFKA_MOUNTED_CONF_DIR}/certs directory."
-        fi
-    elif [[ "${KAFKA_ZOOKEEPER_PROTOCOL}" =~ SASL ]]; then
-        if [[ -z "$KAFKA_ZOOKEEPER_USER" ]] || [[ -z "$KAFKA_ZOOKEEPER_PASSWORD" ]]; then
-            print_validation_error "In order to configure SASL authentication for Kafka, you must provide the SASL credentials. Set the environment variables KAFKA_ZOOKEEPER_USER and KAFKA_ZOOKEEPER_PASSWORD, to configure the credentials for SASL authentication with Zookeeper."
-        fi
-    elif ! is_boolean_yes "$ALLOW_PLAINTEXT_LISTENER"; then
-        print_validation_error "The KAFKA_ZOOKEEPER_PROTOCOL environment variable does not configure a secure protocol. Set the environment variable ALLOW_PLAINTEXT_LISTENER=yes to allow the container to be started with a plaintext listener. This is only recommended for development."
     fi
     check_multi_value "KAFKA_TLS_TYPE" "JKS PEM"
     check_multi_value "KAFKA_ZOOKEEPER_TLS_TYPE" "JKS PEM"