diff --git a/bitnami/nginx/1.24/debian-12/Dockerfile b/bitnami/nginx/1.24/debian-12/Dockerfile
index 830e42624637..f8065e833d94 100644
--- a/bitnami/nginx/1.24/debian-12/Dockerfile
+++ b/bitnami/nginx/1.24/debian-12/Dockerfile
@@ -7,10 +7,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-21T12:43:32Z" \
+      org.opencontainers.image.created="2024-02-29T17:01:41Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.24.0-debian-12-r17" \
+      org.opencontainers.image.ref.name="1.24.0-debian-12-r18" \
       org.opencontainers.image.title="nginx" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.24.0"
diff --git a/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh b/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh
index 1d584e7b82c1..c0f79b87059c 100644
--- a/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh
+++ b/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh
@@ -49,6 +49,7 @@ export NGINX_BASE_DIR="${BITNAMI_ROOT_DIR}/nginx"
 export NGINX_VOLUME_DIR="${BITNAMI_VOLUME_DIR}/nginx"
 export NGINX_SBIN_DIR="${NGINX_BASE_DIR}/sbin"
 export NGINX_CONF_DIR="${NGINX_BASE_DIR}/conf"
+export NGINX_DEFAULT_CONF_DIR="${NGINX_BASE_DIR}/conf.default"
 export NGINX_HTDOCS_DIR="${NGINX_BASE_DIR}/html"
 export NGINX_TMP_DIR="${NGINX_BASE_DIR}/tmp"
 export NGINX_LOGS_DIR="${NGINX_BASE_DIR}/logs"
diff --git a/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh b/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh
index cce4b3e874a3..8d39918d5b0e 100755
--- a/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh
+++ b/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh
@@ -18,6 +18,13 @@ 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/nginx/conf)
+debug "Copying files from $NGINX_DEFAULT_CONF_DIR to $NGINX_CONF_DIR"
+cp -nr "$NGINX_DEFAULT_CONF_DIR"/. "$NGINX_CONF_DIR"
+
+
 if [[ "$1" = "/opt/bitnami/scripts/nginx/run.sh" ]]; then
     info "** Starting NGINX setup **"
     /opt/bitnami/scripts/nginx/setup.sh
diff --git a/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh b/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh
index 2ebe0fb36870..1663462b6286 100755
--- a/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh
+++ b/bitnami/nginx/1.24/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh
@@ -38,7 +38,7 @@ nginx_patch_httpoxy_vulnerability() {
 rm -rf "${BITNAMI_ROOT_DIR}/certs" "${BITNAMI_ROOT_DIR}/server_blocks"
 
 # Ensure non-root user has write permissions on a set of directories
-for dir in "$NGINX_VOLUME_DIR" "$NGINX_CONF_DIR" "$NGINX_INITSCRIPTS_DIR" "$NGINX_SERVER_BLOCKS_DIR" "${NGINX_CONF_DIR}/bitnami" "${NGINX_CONF_DIR}/bitnami/certs" "$NGINX_LOGS_DIR" "$NGINX_TMP_DIR"; do
+for dir in "$NGINX_VOLUME_DIR" "$NGINX_CONF_DIR" "$NGINX_INITSCRIPTS_DIR" "$NGINX_SERVER_BLOCKS_DIR" "${NGINX_CONF_DIR}/bitnami" "${NGINX_CONF_DIR}/bitnami/certs" "$NGINX_LOGS_DIR" "$NGINX_TMP_DIR" "$NGINX_DEFAULT_CONF_DIR"; do
     ensure_dir_exists "$dir"
     chmod -R g+rwX "$dir"
 done
@@ -72,3 +72,8 @@ ln -sf "/dev/stderr" "${NGINX_LOGS_DIR}/error.log"
 # Source: https://stackoverflow.com/questions/94445/using-openssl-what-does-unable-to-write-random-state-mean
 
 touch /.rnd && chmod g+rw /.rnd
+
+# Copy all initially generated configuration files to the default directory
+# (this is to avoid breaking when entrypoint is being overridden)
+cp -r "${NGINX_CONF_DIR}"/* "$NGINX_DEFAULT_CONF_DIR"
+