diff --git a/bitnami/mongodb/6.0/debian-11/Dockerfile b/bitnami/mongodb/6.0/debian-11/Dockerfile
index 61191368507d..65d931cbd51e 100644
--- a/bitnami/mongodb/6.0/debian-11/Dockerfile
+++ b/bitnami/mongodb/6.0/debian-11/Dockerfile
@@ -7,10 +7,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2024-01-11T15:47:47Z" \
+      org.opencontainers.image.created="2024-01-22T12:01:59Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="6.0.12-debian-11-r6" \
+      org.opencontainers.image.ref.name="6.0.12-debian-11-r7" \
       org.opencontainers.image.title="mongodb" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="6.0.12"
@@ -26,11 +26,11 @@ SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 RUN install_packages ca-certificates curl libbrotli1 libcom-err2 libcurl4 libffi7 libgcc-s1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed6 libidn2-0 libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libnettle8 libnghttp2-14 libp11-kit0 libpsl5 librtmp1 libsasl2-2 libssh2-1 libssl1.1 libtasn1-6 libunistring2 numactl procps zlib1g
 RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
     COMPONENTS=( \
-      "mongodb-shell-2.1.1-0-linux-${OS_ARCH}-debian-11" \
       "yq-4.40.5-1-linux-${OS_ARCH}-debian-11" \
       "wait-for-port-1.0.7-5-linux-${OS_ARCH}-debian-11" \
       "render-template-1.0.6-5-linux-${OS_ARCH}-debian-11" \
-      "mongodb-6.0.12-2-linux-${OS_ARCH}-debian-11" \
+      "mongodb-shell-2.1.1-0-linux-${OS_ARCH}-debian-11" \
+      "mongodb-6.0.12-3-linux-${OS_ARCH}-debian-11" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -45,12 +45,13 @@ RUN apt-get autoremove --purge -y curl && \
     apt-get update && apt-get upgrade -y && \
     apt-get clean && rm -rf /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
+RUN find / -perm /6000 -type f -exec chmod a-s {} \; || true
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/mongodb/postunpack.sh
 ENV APP_VERSION="6.0.12" \
     BITNAMI_APP_NAME="mongodb" \
-    PATH="/opt/bitnami/mongodb/bin:/opt/bitnami/common/bin:$PATH"
+    PATH="/opt/bitnami/common/bin:/opt/bitnami/mongodb/bin:$PATH"
 
 EXPOSE 27017
 
diff --git a/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 3fb9261bbf03..f20b250f7fca 100644
--- a/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mongodb/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,7 +3,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "6.0.12-2"
+        "version": "6.0.12-3"
     },
     "mongodb-shell": {
         "arch": "amd64",
diff --git a/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
index 9f18d67751cb..7a6b5c08647b 100644
--- a/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
+++ b/bitnami/mongodb/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
@@ -1278,7 +1278,7 @@ mongodb_wait_until_sync_complete() {
     info "Waiting until initial data sync is complete..."
 
     if ! retry_while "mongodb_is_not_in_sync" "$MONGODB_INIT_RETRY_ATTEMPTS" "$MONGODB_INIT_RETRY_DELAY" 1; then
-        error "Initial data sync did not finish after $MONGODB_MAX_TIMEOUT seconds"
+        error "Initial data sync did not finish after $((MONGODB_INIT_RETRY_ATTEMPTS * MONGODB_INIT_RETRY_DELAY)) seconds"
         exit 1
     else
         info "initial data sync completed"