diff --git a/bitnami/cassandra/4.0/debian-12/Dockerfile b/bitnami/cassandra/4.0/debian-12/Dockerfile
index 8111b3ffdcf9..7a5b1385ad31 100644
--- a/bitnami/cassandra/4.0/debian-12/Dockerfile
+++ b/bitnami/cassandra/4.0/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:30:00Z" \
+      org.opencontainers.image.created="2024-03-07T09:45:00Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="4.0.12-debian-12-r7" \
+      org.opencontainers.image.ref.name="4.0.12-debian-12-r8" \
       org.opencontainers.image.title="cassandra" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="4.0.12"
@@ -27,7 +27,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi8 libgssapi-krb5-2 libjemalloc2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl3 libtinfo6 libtirpc3 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "python-3.11.8-2-linux-${OS_ARCH}-debian-12" \
+      "python-3.11.8-3-linux-${OS_ARCH}-debian-12" \
       "java-11.0.22-12-2-linux-${OS_ARCH}-debian-12" \
       "cassandra-4.0.12-11-linux-${OS_ARCH}-debian-12" \
     ) ; \
diff --git a/bitnami/cassandra/4.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/cassandra/4.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 7edf69e70664..177f8f3e47cf 100644
--- a/bitnami/cassandra/4.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/cassandra/4.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -15,6 +15,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "3.11.8-2"
+        "version": "3.11.8-3"
     }
 }
\ No newline at end of file
diff --git a/bitnami/cassandra/4.0/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh b/bitnami/cassandra/4.0/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh
index 591acaa8e077..57c6f8441cfd 100644
--- a/bitnami/cassandra/4.0/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh
+++ b/bitnami/cassandra/4.0/debian-12/rootfs/opt/bitnami/scripts/libcassandra.sh
@@ -1156,24 +1156,6 @@ cassandra_commitlog_conf_set() {
     cassandra_common_conf_set "${CASSANDRA_CONF_DIR}/commitlog_archiving.properties" "$@"
 }
 
-########################
-# Set a configuration setting value to cassandra.yaml
-# Globals:
-#   CASSANDRA_CONF_DIR
-# Arguments:
-#   $1 - key
-#   $2 - value
-# Returns:
-#   None
-#########################
-cassandra_yaml_conf_set() {
-    if ! cassandra_is_file_external "cassandra.yaml"; then
-        cassandra_yaml_set $1 $2 'no'
-    else
-        debug "cassandra.yaml mounted. Skipping data directory configuration"
-    fi
-}
-
 ########################
 # Configure Cassandra configuration files from environment variables
 # Globals:
@@ -1184,13 +1166,6 @@ cassandra_yaml_conf_set() {
 #   None
 #########################
 cassandra_setup_from_environment_variables() {
-    # Map environment variables to config properties for cassandra.yaml
-    for var in "${!CASSANDRA_CFG_YAML_@}"; do
-        # shellcheck disable=SC2001
-        key="$(echo "$var" | sed -e 's/^CASSANDRA_CFG_YAML_//g' | tr '[:upper:]' '[:lower:]')"
-        value="${!var}"
-        cassandra_yaml_conf_set "$key" "$value"
-    done
     # Map environment variables to config properties for cassandra-env.sh
     for var in "${!CASSANDRA_CFG_ENV_@}"; do
         # shellcheck disable=SC2001
@@ -1210,6 +1185,17 @@ cassandra_setup_from_environment_variables() {
         value="${!var}"
         cassandra_commitlog_conf_set "$key" "$value"
     done
+    if ! cassandra_is_file_external "cassandra.yaml"; then
+        # Map environment variables to config properties for cassandra.yaml
+        for var in "${!CASSANDRA_CFG_YAML_@}"; do
+            # shellcheck disable=SC2001
+            key="$(echo "$var" | sed -e 's/^CASSANDRA_CFG_YAML_//g' | tr '[:upper:]' '[:lower:]')"
+            value="${!var}"
+            cassandra_yaml_set "$key" "$value"
+        done
+    else
+        debug "cassandra.yaml mounted. Skipping data directory configuration"
+    fi
 }
 
 ########################