diff --git a/bitnami/spark/3.5/debian-12/Dockerfile b/bitnami/spark/3.5/debian-12/Dockerfile
index 8f15a4b6cd03..036a6dd341fb 100644
--- a/bitnami/spark/3.5/debian-12/Dockerfile
+++ b/bitnami/spark/3.5/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-10T23:33:53Z" \
+      org.opencontainers.image.created="2024-02-21T04:13:52Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.5.0-debian-12-r15" \
+      org.opencontainers.image.ref.name="3.5.0-debian-12-r16" \
       org.opencontainers.image.title="spark" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.5.0"
@@ -28,9 +28,9 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbz2-1.0 libcom-err2 libcrypt1 libffi8 libgcc-s1 libgssapi-krb5-2 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 liblzma5 libncursesw6 libnsl2 libreadline8 libsqlite3-0 libssl3 libstdc++6 libtinfo6 libtirpc3 procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "python-3.11.8-0-linux-${OS_ARCH}-debian-12" \
-      "java-17.0.10-13-1-linux-${OS_ARCH}-debian-12" \
-      "spark-3.5.0-7-linux-${OS_ARCH}-debian-12" \
+      "python-3.11.8-1-linux-${OS_ARCH}-debian-12" \
+      "java-17.0.10-13-2-linux-${OS_ARCH}-debian-12" \
+      "spark-3.5.0-8-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
diff --git a/bitnami/spark/3.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/spark/3.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 5a206ebf2b97..8ea08ec2647d 100644
--- a/bitnami/spark/3.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/spark/3.5/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,18 +3,18 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "17.0.10-13-1"
+        "version": "17.0.10-13-2"
     },
     "python": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "3.11.8-0"
+        "version": "3.11.8-1"
     },
     "spark": {
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "3.5.0-7"
+        "version": "3.5.0-8"
     }
 }
\ No newline at end of file
diff --git a/bitnami/spark/3.5/debian-12/rootfs/opt/bitnami/scripts/spark-env.sh b/bitnami/spark/3.5/debian-12/rootfs/opt/bitnami/scripts/spark-env.sh
index 45530bb3923a..15bde9710e2d 100644
--- a/bitnami/spark/3.5/debian-12/rootfs/opt/bitnami/scripts/spark-env.sh
+++ b/bitnami/spark/3.5/debian-12/rootfs/opt/bitnami/scripts/spark-env.sh
@@ -58,6 +58,7 @@ unset spark_env_vars
 # Paths
 export SPARK_BASE_DIR="${BITNAMI_ROOT_DIR}/spark"
 export SPARK_CONF_DIR="${SPARK_BASE_DIR}/conf"
+export SPARK_DEFAULT_CONF_DIR="${SPARK_BASE_DIR}/conf.default"
 export SPARK_WORK_DIR="${SPARK_BASE_DIR}/work"
 export SPARK_CONF_FILE="${SPARK_CONF_DIR}/spark-defaults.conf"
 export SPARK_LOG_DIR="${SPARK_BASE_DIR}/logs"
diff --git a/bitnami/spark/3.5/debian-12/rootfs/opt/bitnami/scripts/spark/entrypoint.sh b/bitnami/spark/3.5/debian-12/rootfs/opt/bitnami/scripts/spark/entrypoint.sh
index ec07b0552d2c..153bf9a545ef 100755
--- a/bitnami/spark/3.5/debian-12/rootfs/opt/bitnami/scripts/spark/entrypoint.sh
+++ b/bitnami/spark/3.5/debian-12/rootfs/opt/bitnami/scripts/spark/entrypoint.sh
@@ -18,6 +18,12 @@ set -o pipefail
 
 print_welcome_page
 
+# We add the copy from default config in the entrypoint to not break users 
+# bypassing the setup.sh logic. If the file already exists do not overwrite (in
+# case someone mounts a configuration file in /opt/bitnami/spark/conf)
+debug "Copying files from $SPARK_DEFAULT_CONF_DIR to $SPARK_CONF_DIR"
+cp -nr "$SPARK_DEFAULT_CONF_DIR"/. "$SPARK_CONF_DIR"
+
 if [ ! $EUID -eq 0 ] && [ -e "$LIBNSS_WRAPPER_PATH" ]; then
     echo "spark:x:$(id -u):$(id -g):Spark:$SPARK_HOME:/bin/false" > "$NSS_WRAPPER_PASSWD"
     echo "spark:x:$(id -g):" > "$NSS_WRAPPER_GROUP"
diff --git a/bitnami/spark/3.5/debian-12/rootfs/opt/bitnami/scripts/spark/postunpack.sh b/bitnami/spark/3.5/debian-12/rootfs/opt/bitnami/scripts/spark/postunpack.sh
index f330738021fe..3528fd707644 100755
--- a/bitnami/spark/3.5/debian-12/rootfs/opt/bitnami/scripts/spark/postunpack.sh
+++ b/bitnami/spark/3.5/debian-12/rootfs/opt/bitnami/scripts/spark/postunpack.sh
@@ -11,10 +11,14 @@
 # Load Spark environment settings
 . /opt/bitnami/scripts/spark-env.sh
 
-for dir in "$SPARK_TMP_DIR" "$SPARK_LOG_DIR" "$SPARK_CONF_DIR" "$SPARK_WORK_DIR" "$SPARK_JARS_DIR"; do
+for dir in "$SPARK_TMP_DIR" "$SPARK_LOG_DIR" "$SPARK_CONF_DIR" "$SPARK_DEFAULT_CONF_DIR" "$SPARK_WORK_DIR" "$SPARK_JARS_DIR"; do
     ensure_dir_exists "$dir"
     configure_permissions_ownership "$dir" -d "775" -f "664" -g "root"
 done
 
 # Set correct owner in installation directory
 chown -R "1001:root" "$SPARK_BASE_DIR"
+
+# Copy all initially generated configuration files to the default directory
+# (this is to avoid breaking when entrypoint is being overridden)
+cp -r "${SPARK_CONF_DIR}/"* "$SPARK_DEFAULT_CONF_DIR"
\ No newline at end of file