diff --git a/bitnami/kafka/3.4/debian-12/Dockerfile b/bitnami/kafka/3.4/debian-12/Dockerfile
index b915f00244a8..48533d32b27c 100644
--- a/bitnami/kafka/3.4/debian-12/Dockerfile
+++ b/bitnami/kafka/3.4/debian-12/Dockerfile
@@ -8,10 +8,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2024-02-21T11:56:49Z" \
+      org.opencontainers.image.created="2024-03-22T12:59:31Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.4.1-debian-12-r20" \
+      org.opencontainers.image.ref.name="3.4.1-debian-12-r21" \
       org.opencontainers.image.title="kafka" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.4.1"
@@ -27,8 +27,8 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "wait-for-port-1.0.7-8-linux-${OS_ARCH}-debian-12" \
-      "render-template-1.0.6-9-linux-${OS_ARCH}-debian-12" \
+      "wait-for-port-1.0.7-10-linux-${OS_ARCH}-debian-12" \
+      "render-template-1.0.6-10-linux-${OS_ARCH}-debian-12" \
       "java-17.0.10-13-2-linux-${OS_ARCH}-debian-12" \
       "kafka-3.4.1-5-linux-${OS_ARCH}-debian-12" \
     ) ; \
diff --git a/bitnami/kafka/3.4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/kafka/3.4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index dde6baf6219a..c7f844dcf263 100644
--- a/bitnami/kafka/3.4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/kafka/3.4/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,12 +15,12 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.6-9"
+        "version": "1.0.6-10"
     },
     "wait-for-port": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.7-8"
+        "version": "1.0.7-10"
     }
 }
\ No newline at end of file
diff --git a/bitnami/kafka/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/kafka/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
index 3853c789b2ea..aa782fc6a4db 100644
--- a/bitnami/kafka/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
+++ b/bitnami/kafka/3.4/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
@@ -48,6 +48,7 @@ print_image_welcome_page() {
     info "${BOLD}Welcome to the Bitnami ${BITNAMI_APP_NAME} container${RESET}"
     info "Subscribe to project updates by watching ${BOLD}${github_url}${RESET}"
     info "Submit issues and feature requests at ${BOLD}${github_url}/issues${RESET}"
+    info "Upgrade to Tanzu Application Catalog for production environments to access custom-configured and pre-packaged software components. Gain enhanced features, including Software Bill of Materials (SBOM), CVE scan result reports, and VEX documents. To learn more, visit ${BOLD}https://bitnami.com/enterprise${RESET}"
     info ""
 }
 
diff --git a/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/kafka/run.sh b/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/kafka/run.sh
index a82f26867e70..7a30df6aa883 100755
--- a/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/kafka/run.sh
+++ b/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/kafka/run.sh
@@ -17,7 +17,7 @@ set -o pipefail
 . /opt/bitnami/scripts/kafka-env.sh
 
 if [[ -f "${KAFKA_CONF_DIR}/kafka_jaas.conf" ]]; then
-    export KAFKA_OPTS="-Djava.security.auth.login.config=${KAFKA_CONF_DIR}/kafka_jaas.conf"
+    export KAFKA_OPTS="${KAFKA_OPTS:-} -Djava.security.auth.login.config=${KAFKA_CONF_DIR}/kafka_jaas.conf"
 fi
 
 cmd="$KAFKA_HOME/bin/kafka-server-start.sh"
diff --git a/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/libkafka.sh b/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/libkafka.sh
index 0efa81c4b873..4167a98c5116 100644
--- a/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/libkafka.sh
+++ b/bitnami/kafka/3.4/debian-12/rootfs/opt/bitnami/scripts/libkafka.sh
@@ -816,8 +816,7 @@ kafka_configure_from_environment_variables() {
         done
 
         value="${!var}"
-        # Skip empty variables from kafka-env.sh
-        ! is_empty_value "$value" && kafka_server_conf_set "$key" "$value"
+        kafka_server_conf_set "$key" "$value"
     done
 }
 
@@ -1002,9 +1001,15 @@ kafka_initialize() {
                     kafka_producer_consumer_conf_set security.protocol "$protocol"
                     kafka_producer_consumer_conf_set sasl.mechanism "${KAFKA_CLIENT_SASL_MECHANISM:-$(kafka_client_sasl_mechanism)}"
                 fi
-                kafka_configure_server_jaas "$listener_lower" "${role:-}"
+                # Configure inline listener jaas configuration, omitted if mounted JAAS conf file detected
+                if [[ ! -f "${KAFKA_CONF_DIR}/kafka_jaas.conf" ]]; then
+                    kafka_configure_server_jaas "$listener_lower" "${role:-}"
+                fi
             fi
         done
+        # Configure Kafka using environment variables
+        # This is executed at the end, to allow users to override properties set by the initialization logic
+        kafka_configure_from_environment_variables
     else
         info "Detected mounted server.properties file at ${KAFKA_MOUNTED_CONF_DIR}/server.properties. Skipping configuration based on env variables"
     fi