diff --git a/bitnami/mongodb/7.0/debian-12/Dockerfile b/bitnami/mongodb/7.0/debian-12/Dockerfile
index 9f9c36d0ed85..0461357f8172 100644
--- a/bitnami/mongodb/7.0/debian-12/Dockerfile
+++ b/bitnami/mongodb/7.0/debian-12/Dockerfile
@@ -7,11 +7,11 @@ 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-04-23T18:17:35Z" \
+      org.opencontainers.image.created="2024-04-25T14:03:16Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/mongodb/README.md" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="7.0.8-debian-12-r3" \
+      org.opencontainers.image.ref.name="7.0.8-debian-12-r4" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/mongodb" \
       org.opencontainers.image.title="mongodb" \
       org.opencontainers.image.vendor="VMware, Inc." \
@@ -31,7 +31,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
       "yq-4.43.1-1-linux-${OS_ARCH}-debian-12" \
       "wait-for-port-1.0.7-11-linux-${OS_ARCH}-debian-12" \
       "render-template-1.0.6-11-linux-${OS_ARCH}-debian-12" \
-      "mongodb-shell-2.2.4-0-linux-${OS_ARCH}-debian-12" \
+      "mongodb-shell-2.2.5-0-linux-${OS_ARCH}-debian-12" \
       "mongodb-7.0.8-1-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
diff --git a/bitnami/mongodb/7.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/mongodb/7.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index 29ec4ff2007e..3cd9e9f381af 100644
--- a/bitnami/mongodb/7.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/mongodb/7.0/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,7 +9,7 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "2.2.4-0"
+        "version": "2.2.5-0"
     },
     "render-template": {
         "arch": "amd64",
diff --git a/bitnami/mongodb/7.0/debian-12/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb/7.0/debian-12/rootfs/opt/bitnami/scripts/libmongodb.sh
index a3ac19659991..0197e6d30739 100644
--- a/bitnami/mongodb/7.0/debian-12/rootfs/opt/bitnami/scripts/libmongodb.sh
+++ b/bitnami/mongodb/7.0/debian-12/rootfs/opt/bitnami/scripts/libmongodb.sh
@@ -697,7 +697,7 @@ mongodb_create_user() {
     [[ -z "$database" ]] && query="db.getSiblingDB(db.stats().db).createUser({ user: '$user', pwd: '$password', roles: [{role: 'readWrite', db: db.getSiblingDB(db.stats().db).stats().db }] })"
     # Create user, discarding mongo CLI output for clean logs
     info "Creating user '$user'..."
-    mongodb_execute "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "" "127.0.0.1" <<<"$query"
+    mongodb_execute "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "" "127.0.0.1" "" "${MONGODB_SHELL_EXTRA_FLAGS} --tlsAllowInvalidHostnames" <<<"$query"
 }
 
 ########################
@@ -714,7 +714,7 @@ mongodb_create_users() {
 
     if [[ -n "$MONGODB_ROOT_PASSWORD" ]] && ! [[ "$MONGODB_REPLICA_SET_MODE" =~ ^(secondary|arbiter|hidden) ]]; then
         info "Creating $MONGODB_ROOT_USER user..."
-        mongodb_execute "" "" "" "127.0.0.1" <<EOF
+        mongodb_execute "" "" "" "127.0.0.1" "" "${MONGODB_SHELL_EXTRA_FLAGS} --tlsAllowInvalidHostnames" <<EOF
 db.getSiblingDB('admin').createUser({ user: '$MONGODB_ROOT_USER', pwd: '$MONGODB_ROOT_PASSWORD', roles: [{role: 'root', db: 'admin'}] })
 EOF
     fi
@@ -744,7 +744,7 @@ EOF
 
     if [[ -n "$MONGODB_METRICS_USERNAME" ]] && [[ -n "$MONGODB_METRICS_PASSWORD" ]]; then
         info "Creating '$MONGODB_METRICS_USERNAME' user..."
-        mongodb_execute "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "" "127.0.0.1" <<EOF
+        mongodb_execute "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "" "127.0.0.1" "" "${MONGODB_SHELL_EXTRA_FLAGS} --tlsAllowInvalidHostnames" <<EOF
 db.getSiblingDB('admin').createUser({ user: '$MONGODB_METRICS_USERNAME', pwd: '$MONGODB_METRICS_PASSWORD', roles: [{role: 'clusterMonitor', db: 'admin'},{ role: 'read', db: 'local' }] })
 EOF
     fi
@@ -814,7 +814,7 @@ mongodb_is_primary_node_initiated() {
     local port="${2:?port is required}"
     local result
     result=$(
-        mongodb_execute_print_output "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "admin" "127.0.0.1" "$MONGODB_PORT_NUMBER" <<EOF
+        mongodb_execute_print_output "$MONGODB_ROOT_USER" "$MONGODB_ROOT_PASSWORD" "admin" "127.0.0.1" "$MONGODB_PORT_NUMBER" "${MONGODB_SHELL_EXTRA_FLAGS} --tlsAllowInvalidHostnames" <<EOF
 rs.initiate({"_id":"$MONGODB_REPLICA_SET_NAME", "members":[{"_id":0,"host":"$node:$port","priority":5}]})
 EOF
     )