diff --git a/bitnami/mongodb/5.0/debian-10/Dockerfile b/bitnami/mongodb/5.0/debian-10/Dockerfile
index 113caf4c2c59..d070b35d6c6f 100644
--- a/bitnami/mongodb/5.0/debian-10/Dockerfile
+++ b/bitnami/mongodb/5.0/debian-10/Dockerfile
@@ -23,7 +23,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/mongodb/postunpack.sh
 ENV APP_VERSION="5.0.8" \
     BITNAMI_APP_NAME="mongodb" \
-    PATH="/opt/bitnami/common/bin:/opt/bitnami/mongodb/bin:$PATH"
+    PATH="/opt/bitnami/mongodb/bin:/opt/bitnami/common/bin:$PATH"
 
 EXPOSE 27017
 
diff --git a/bitnami/mongodb/5.0/debian-10/rootfs/opt/bitnami/scripts/libmongodb.sh b/bitnami/mongodb/5.0/debian-10/rootfs/opt/bitnami/scripts/libmongodb.sh
index e3a3d78bc71a..1a8a098b959f 100644
--- a/bitnami/mongodb/5.0/debian-10/rootfs/opt/bitnami/scripts/libmongodb.sh
+++ b/bitnami/mongodb/5.0/debian-10/rootfs/opt/bitnami/scripts/libmongodb.sh
@@ -251,7 +251,7 @@ get_mongo_hostname() {
     if [[ -n "$MONGODB_ADVERTISED_HOSTNAME" ]]; then
         echo "$MONGODB_ADVERTISED_HOSTNAME"
     else
-        get_machine_ip
+        hostname
     fi
 }
 
@@ -401,7 +401,7 @@ mongodb_is_mongodb_started() {
     local result
 
     result=$(
-        mongodb_execute_print_output 2>/dev/null <<EOF
+        mongodb_execute_print_output <<EOF
 db
 EOF
     )
@@ -1566,7 +1566,7 @@ mongodb_custom_init_scripts() {
 #   $3 - Database where to run the queries
 #   $4 - Host (default to result of get_mongo_hostname function)
 #   $5 - Port (default $MONGODB_PORT_NUMBER)
-#   $6 - Extra arguments (default $MONGODB_CLIENT_EXTRA_FLAGS)
+#   $6 - Extra arguments (default $MONGODB_SHELL_EXTRA_FLAGS)
 # Returns:
 #   output of mongo query
 ########################
@@ -1576,7 +1576,7 @@ mongodb_execute_print_output() {
     local -r database="${3:-}"
     local -r host="${4:-$(get_mongo_hostname)}"
     local -r port="${5:-$MONGODB_PORT_NUMBER}"
-    local -r extra_args="${6:-$MONGODB_CLIENT_EXTRA_FLAGS}"
+    local -r extra_args="${6:-$MONGODB_SHELL_EXTRA_FLAGS}"
     local final_user="$user"
     # If password is empty it means no auth, do not specify user
     [[ -z "$password" ]] && final_user=""
@@ -1607,7 +1607,7 @@ mongodb_execute_print_output() {
 #   $3 - Database where to run the queries
 #   $4 - Host (default to result of get_mongo_hostname function)
 #   $5 - Port (default $MONGODB_PORT_NUMBER)
-#   $6 - Extra arguments (default $MONGODB_CLIENT_EXTRA_FLAGS)
+#   $6 - Extra arguments (default $MONGODB_SHELL_EXTRA_FLAGS)
 # Returns:
 #   None
 ########################
@@ -1625,7 +1625,7 @@ mongodb_execute() {
 #   $3 - Database where to run the queries
 #   $4 - Host (default to result of get_mongo_hostname function)
 #   $5 - Port (default $MONGODB_PORT_NUMBER)
-#   $6 - Extra arguments (default $MONGODB_CLIENT_EXTRA_FLAGS)
+#   $6 - Extra arguments (default $MONGODB_SHELL_EXTRA_FLAGS)
 # Returns:
 #   None
 ########################
@@ -1635,7 +1635,7 @@ mongodb_execute() {
     local -r database="${3:-}"
     local -r host="${4:-$(get_mongo_hostname)}"
     local -r port="${5:-$MONGODB_PORT_NUMBER}"
-    local -r extra_args="${6:-$MONGODB_CLIENT_EXTRA_FLAGS}"
+    local -r extra_args="${6:-$MONGODB_SHELL_EXTRA_FLAGS}"
     local final_user="$user"
     # If password is empty it means no auth, do not specify user
     [[ -z "$password" ]] && final_user=""
diff --git a/bitnami/mongodb/5.0/debian-10/rootfs/opt/bitnami/scripts/mongodb-env.sh b/bitnami/mongodb/5.0/debian-10/rootfs/opt/bitnami/scripts/mongodb-env.sh
index daf18e1f0035..00aff26414d9 100644
--- a/bitnami/mongodb/5.0/debian-10/rootfs/opt/bitnami/scripts/mongodb-env.sh
+++ b/bitnami/mongodb/5.0/debian-10/rootfs/opt/bitnami/scripts/mongodb-env.sh
@@ -29,7 +29,7 @@ mongodb_env_vars=(
     MONGODB_DEFAULT_ENABLE_MAJORITY_READ
     MONGODB_EXTRA_FLAGS
     MONGODB_ENABLE_NUMACTL
-    MONGODB_CLIENT_EXTRA_FLAGS
+    MONGODB_SHELL_EXTRA_FLAGS
     MONGODB_ADVERTISED_HOSTNAME
     MONGODB_ADVERTISED_PORT_NUMBER
     MONGODB_DISABLE_JAVASCRIPT
@@ -57,6 +57,7 @@ mongodb_env_vars=(
     MONGODB_INITIAL_PRIMARY_ROOT_PASSWORD
     MONGODB_INITIAL_PRIMARY_ROOT_USER
     MONGODB_SET_SECONDARY_OK
+    MONGODB_CLIENT_EXTRA_FLAGS
     MONGODB_PRIMARY_HOST
     MONGODB_PRIMARY_PORT_NUMBER
     MONGODB_PRIMARY_ROOT_PASSWORD
@@ -109,7 +110,8 @@ export MONGODB_ENABLE_MAJORITY_READ="${MONGODB_ENABLE_MAJORITY_READ:-true}"
 export MONGODB_DEFAULT_ENABLE_MAJORITY_READ="${MONGODB_DEFAULT_ENABLE_MAJORITY_READ:-true}"
 export MONGODB_EXTRA_FLAGS="${MONGODB_EXTRA_FLAGS:-}"
 export MONGODB_ENABLE_NUMACTL="${MONGODB_ENABLE_NUMACTL:-false}"
-export MONGODB_CLIENT_EXTRA_FLAGS="${MONGODB_CLIENT_EXTRA_FLAGS:-}"
+MONGODB_SHELL_EXTRA_FLAGS="${MONGODB_SHELL_EXTRA_FLAGS:-"${MONGODB_CLIENT_EXTRA_FLAGS:-}"}"
+export MONGODB_SHELL_EXTRA_FLAGS="${MONGODB_SHELL_EXTRA_FLAGS:-}"
 export MONGODB_ADVERTISED_HOSTNAME="${MONGODB_ADVERTISED_HOSTNAME:-}"
 export MONGODB_ADVERTISED_PORT_NUMBER="${MONGODB_ADVERTISED_PORT_NUMBER:-}"
 export MONGODB_DISABLE_JAVASCRIPT="${MONGODB_DISABLE_JAVASCRIPT:-no}"
diff --git a/bitnami/mongodb/README.md b/bitnami/mongodb/README.md
index 9fd67bd779c0..26f9ca9df3b9 100644
--- a/bitnami/mongodb/README.md
+++ b/bitnami/mongodb/README.md
@@ -45,7 +45,7 @@ Non-root container images add an extra layer of security and are generally recom
 Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/tutorials/understand-rolling-tags-containers/).
 
 
-* [`5.0`, `5.0-debian-10`, `5.0.8`, `5.0.8-debian-10-r9`, `latest` (5.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/5.0.8-debian-10-r9/5.0/debian-10/Dockerfile)
+* [`5.0`, `5.0-debian-10`, `5.0.8`, `5.0.8-debian-10-r10`, `latest` (5.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/5.0.8-debian-10-r10/5.0/debian-10/Dockerfile)
 * [`4.4`, `4.4-debian-10`, `4.4.13`, `4.4.13-debian-10-r59` (4.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.4.13-debian-10-r59/4.4/debian-10/Dockerfile)
 * [`4.2`, `4.2-debian-10`, `4.2.19`, `4.2.19-debian-10-r56` (4.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.2.19-debian-10-r56/4.2/debian-10/Dockerfile)