diff --git a/bitnami/appsmith/1/debian-12/Dockerfile b/bitnami/appsmith/1/debian-12/Dockerfile
index 2983251d885e..e80a852df98f 100644
--- a/bitnami/appsmith/1/debian-12/Dockerfile
+++ b/bitnami/appsmith/1/debian-12/Dockerfile
@@ -7,13 +7,13 @@ 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-28T13:52:44Z" \
+      org.opencontainers.image.created="2024-03-01T13:38:38Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.14.0-debian-12-r0" \
+      org.opencontainers.image.ref.name="1.15.0-debian-12-r0" \
       org.opencontainers.image.title="appsmith" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="1.14.0"
+      org.opencontainers.image.version="1.15.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -33,7 +33,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
       "nginx-1.25.4-0-linux-${OS_ARCH}-debian-12" \
       "mongodb-shell-2.1.5-0-linux-${OS_ARCH}-debian-12" \
       "java-17.0.10-13-2-linux-${OS_ARCH}-debian-12" \
-      "appsmith-1.14.0-0-linux-${OS_ARCH}-debian-12" \
+      "appsmith-1.15.0-0-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -52,7 +52,7 @@ RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
 COPY rootfs /
 RUN /opt/bitnami/scripts/nginx/postunpack.sh
 RUN /opt/bitnami/scripts/appsmith/postunpack.sh
-ENV APP_VERSION="1.14.0" \
+ENV APP_VERSION="1.15.0" \
     BITNAMI_APP_NAME="appsmith" \
     NGINX_HTTPS_PORT_NUMBER="" \
     NGINX_HTTP_PORT_NUMBER="" \
diff --git a/bitnami/appsmith/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/appsmith/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 4ce21397d131..f9962c777fe1 100644
--- a/bitnami/appsmith/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/appsmith/1/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "1.14.0-0"
+        "version": "1.15.0-0"
     },
     "java": {
         "arch": "amd64",
diff --git a/bitnami/appsmith/1/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh b/bitnami/appsmith/1/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh
index 1d584e7b82c1..c0f79b87059c 100644
--- a/bitnami/appsmith/1/debian-12/rootfs/opt/bitnami/scripts/nginx-env.sh
+++ b/bitnami/appsmith/1/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/appsmith/1/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh b/bitnami/appsmith/1/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh
index cce4b3e874a3..8d39918d5b0e 100755
--- a/bitnami/appsmith/1/debian-12/rootfs/opt/bitnami/scripts/nginx/entrypoint.sh
+++ b/bitnami/appsmith/1/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/appsmith/1/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh b/bitnami/appsmith/1/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh
index 2ebe0fb36870..1663462b6286 100755
--- a/bitnami/appsmith/1/debian-12/rootfs/opt/bitnami/scripts/nginx/postunpack.sh
+++ b/bitnami/appsmith/1/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"
+
diff --git a/bitnami/appsmith/1/debian-12/tags-info.yaml b/bitnami/appsmith/1/debian-12/tags-info.yaml
index 857bd8853a50..a2c5f94242fe 100644
--- a/bitnami/appsmith/1/debian-12/tags-info.yaml
+++ b/bitnami/appsmith/1/debian-12/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "1"
 - 1-debian-12
-- 1.14.0
+- 1.15.0
 - latest