diff --git a/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile b/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile
index c8f10a5b099f..67bd176e1235 100644
--- a/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile
+++ b/bitnami/mongodb-sharded/6.0/debian-11/Dockerfile
@@ -7,13 +7,13 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-08-17T21:50:43Z" \
+      org.opencontainers.image.created="2023-08-25T14:05:46Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="6.0.8-debian-11-r33" \
+      org.opencontainers.image.ref.name="6.0.9-debian-11-r0" \
       org.opencontainers.image.title="mongodb-sharded" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="6.0.8"
+      org.opencontainers.image.version="6.0.9"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -26,11 +26,11 @@ SHELL ["/bin/bash", "-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-1.10.5-0-linux-${OS_ARCH}-debian-11" \
+      "mongodb-shell-1.10.6-0-linux-${OS_ARCH}-debian-11" \
       "yq-4.35.1-0-linux-${OS_ARCH}-debian-11" \
-      "wait-for-port-1.0.6-11-linux-${OS_ARCH}-debian-11" \
-      "render-template-1.0.5-10-linux-${OS_ARCH}-debian-11" \
-      "mongodb-6.0.8-1-linux-${OS_ARCH}-debian-11" \
+      "wait-for-port-1.0.6-13-linux-${OS_ARCH}-debian-11" \
+      "render-template-1.0.5-13-linux-${OS_ARCH}-debian-11" \
+      "mongodb-6.0.9-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -50,7 +50,7 @@ RUN ln -s /opt/bitnami/scripts/mongodb-sharded/run.sh /run.sh
 
 COPY rootfs /
 RUN /opt/bitnami/scripts/mongodb-sharded/postunpack.sh
-ENV APP_VERSION="6.0.8" \
+ENV APP_VERSION="6.0.9" \
     BITNAMI_APP_NAME="mongodb-sharded" \
     PATH="/opt/bitnami/mongodb/bin:/opt/bitnami/common/bin:$PATH"
 
diff --git a/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index 5e046b50d38a..a2279d339bc1 100644
--- a/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mongodb-sharded/6.0/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,25 +3,25 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "6.0.8-1"
+        "version": "6.0.9-0"
     },
     "mongodb-shell": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.10.5-0"
+        "version": "1.10.6-0"
     },
     "render-template": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.0.5-10"
+        "version": "1.0.5-13"
     },
     "wait-for-port": {
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.0.6-11"
+        "version": "1.0.6-13"
     },
     "yq": {
         "arch": "amd64",
diff --git a/bitnami/mongodb-sharded/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb-sharded/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
index 75687dc120b9..e613c77550f2 100644
--- a/bitnami/mongodb-sharded/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
+++ b/bitnami/mongodb-sharded/6.0/debian-11/rootfs/opt/bitnami/scripts/libmongodb.sh
@@ -1403,7 +1403,6 @@ mongodb_initialize() {
             mongodb_create_keyfile "$MONGODB_REPLICA_SET_KEY"
             mongodb_set_keyfile_conf "$MONGODB_CONF_FILE"
         fi
-        mongodb_set_replicasetmode_conf "$MONGODB_CONF_FILE"
     fi
 
     if is_dir_empty "$MONGODB_DATA_DIR/db"; then
@@ -1414,10 +1413,6 @@ mongodb_initialize() {
         mongodb_start_bg "$MONGODB_CONF_FILE"
         mongodb_create_users
         if [[ -n "$MONGODB_REPLICA_SET_MODE" ]]; then
-            if [[ -n "$MONGODB_REPLICA_SET_KEY" ]]; then
-                mongodb_create_keyfile "$MONGODB_REPLICA_SET_KEY"
-                mongodb_set_keyfile_conf "$MONGODB_CONF_FILE"
-            fi
             mongodb_set_replicasetmode_conf "$MONGODB_CONF_FILE"
             mongodb_set_listen_all_conf "$MONGODB_CONF_FILE"
             mongodb_configure_replica_set
@@ -1427,8 +1422,11 @@ mongodb_initialize() {
     else
         mongodb_set_auth_conf "$MONGODB_CONF_FILE"
         info "Deploying MongoDB with persisted data..."
-        if [[ -n "$MONGODB_REPLICA_SET_MODE" ]] && [[ "$MONGODB_REPLICA_SET_MODE" = "dynamic" ]]; then
-            mongodb_ensure_dynamic_mode_consistency
+        if [[ -n "$MONGODB_REPLICA_SET_MODE" ]]; then
+            if [[ "$MONGODB_REPLICA_SET_MODE" = "dynamic" ]]; then
+                mongodb_ensure_dynamic_mode_consistency
+            fi
+            mongodb_set_replicasetmode_conf "$MONGODB_CONF_FILE"
         fi
     fi
 
diff --git a/bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml b/bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml
index 2d6d4a960500..cd96c0075bbd 100644
--- a/bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml
+++ b/bitnami/mongodb-sharded/6.0/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "6.0"
 - 6.0-debian-11
-- 6.0.8
+- 6.0.9
 - latest