diff --git a/bitnami/nginx-intel/0/debian-11/Dockerfile b/bitnami/nginx-intel/0/debian-11/Dockerfile
index 09ad7f3f7ed8..6502e56ce5f9 100644
--- a/bitnami/nginx-intel/0/debian-11/Dockerfile
+++ b/bitnami/nginx-intel/0/debian-11/Dockerfile
@@ -4,7 +4,7 @@ ARG TARGETARCH
 
 LABEL org.opencontainers.image.authors="https://bitnami.com/contact" \
       org.opencontainers.image.description="Application packaged by Bitnami" \
-      org.opencontainers.image.ref.name="0.4.8-debian-11-r9" \
+      org.opencontainers.image.ref.name="0.4.8-debian-11-r10" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/nginx-intel" \
       org.opencontainers.image.title="nginx-intel" \
       org.opencontainers.image.vendor="VMware, Inc." \
diff --git a/bitnami/nginx-intel/0/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh b/bitnami/nginx-intel/0/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
index 3926fb4b7660..5886efec8713 100755
--- a/bitnami/nginx-intel/0/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
+++ b/bitnami/nginx-intel/0/debian-11/rootfs/opt/bitnami/scripts/nginx/setup.sh
@@ -31,7 +31,7 @@ nginx_custom_init_scripts
 ! am_i_root || chmod o+w "$(readlink /dev/stdout)" "$(readlink /dev/stderr)"
 
 # Configure HTTPS port number
-if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]]; then
+if [[ -n "${NGINX_HTTPS_PORT_NUMBER:-}" ]] && [[ ! -f "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf" ]] && is_dir_empty "${NGINX_SERVER_BLOCKS_DIR}"; then
     cp "${BITNAMI_ROOT_DIR}/scripts/nginx/server_blocks/default-https-server-block.conf" "${NGINX_SERVER_BLOCKS_DIR}/default-https-server-block.conf"
 fi