diff --git a/bitnami/nginx/1.25/debian-12/Dockerfile b/bitnami/nginx/1.25/debian-12/Dockerfile
index 6159039dd0d6..e236700877d3 100644
--- a/bitnami/nginx/1.25/debian-12/Dockerfile
+++ b/bitnami/nginx/1.25/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-29T17:01:45Z" \
+      org.opencontainers.image.created="2024-03-30T17:26:03Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.25.4-debian-12-r3" \
+      org.opencontainers.image.ref.name="1.25.4-debian-12-r4" \
       org.opencontainers.image.title="nginx" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="1.25.4"
@@ -26,7 +26,7 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libcrypt1 libgeoip1 libpcre3 libssl3 openssl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "render-template-1.0.6-9-linux-${OS_ARCH}-debian-12" \
+      "render-template-1.0.6-10-linux-${OS_ARCH}-debian-12" \
       "nginx-1.25.4-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 096d82e8f767..a7cfcd07d707 100644
--- a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,6 +9,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.0.6-9"
+        "version": "1.0.6-10"
     }
 }
\ No newline at end of file
diff --git a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh b/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
index 3853c789b2ea..aa782fc6a4db 100644
--- a/bitnami/nginx/1.25/debian-12/prebuildfs/opt/bitnami/scripts/libbitnami.sh
+++ b/bitnami/nginx/1.25/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/nginx/1.25/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh b/bitnami/nginx/1.25/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh
index 40f204ea4f7c..e72f5eddd15c 100644
--- a/bitnami/nginx/1.25/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh
+++ b/bitnami/nginx/1.25/debian-12/rootfs/opt/bitnami/scripts/libnginx.sh
@@ -164,6 +164,11 @@ nginx_validate() {
 nginx_initialize() {
     info "Initializing NGINX"
 
+    # 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" || true
+
     # This fixes an issue where the trap would kill the entrypoint.sh, if a PID was left over from a previous run
     # Exec replaces the process without creating a new one, and when the container is restarted it may have the same PID
     rm -f "${NGINX_TMP_DIR}/nginx.pid"