diff --git a/bitnami/mongodb/3.6/debian-9/Dockerfile b/bitnami/mongodb/3.6/debian-9/Dockerfile
index fe5a5584ae55..e48272bc668e 100644
--- a/bitnami/mongodb/3.6/debian-9/Dockerfile
+++ b/bitnami/mongodb/3.6/debian-9/Dockerfile
@@ -19,7 +19,7 @@ RUN chmod g+rwX /opt/bitnami
 COPY rootfs /
 RUN /opt/bitnami/scripts/mongodb/postunpack.sh
 ENV BITNAMI_APP_NAME="mongodb" \
-    BITNAMI_IMAGE_VERSION="3.6.21-debian-9-r32" \
+    BITNAMI_IMAGE_VERSION="3.6.21-debian-9-r33" \
     PATH="/opt/bitnami/common/bin:/opt/bitnami/mongodb/bin:$PATH"
 
 EXPOSE 27017
diff --git a/bitnami/mongodb/3.6/debian-9/prebuildfs/opt/bitnami/scripts/libnet.sh b/bitnami/mongodb/3.6/debian-9/prebuildfs/opt/bitnami/scripts/libnet.sh
index d658d7607277..4391dacc7853 100644
--- a/bitnami/mongodb/3.6/debian-9/prebuildfs/opt/bitnami/scripts/libnet.sh
+++ b/bitnami/mongodb/3.6/debian-9/prebuildfs/opt/bitnami/scripts/libnet.sh
@@ -10,15 +10,17 @@
 # Functions
 
 ########################
-# Resolve dns
+# Resolve IP address for a host/domain (i.e. DNS lookup)
 # Arguments:
 #   $1 - Hostname to resolve
+#   $2 - IP address version (v4, v6), leave empty for resolving to any version
 # Returns:
 #   IP
 #########################
 dns_lookup() {
     local host="${1:?host is missing}"
-    getent ahosts "$host" | awk '/STREAM/ {print $1 }'
+    local ip_version="${2:-}"
+    getent "ahosts${ip_version}" "$host" | awk '/STREAM/ {print $1 }' | head -n 1
 }
 
 #########################
diff --git a/bitnami/mongodb/README.md b/bitnami/mongodb/README.md
index 11006198e813..02d1bc8fa14b 100644
--- a/bitnami/mongodb/README.md
+++ b/bitnami/mongodb/README.md
@@ -49,7 +49,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`4.4`, `4.4-debian-10`, `4.4.2`, `4.4.2-debian-10-r27`, `latest` (4.4/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.4.2-debian-10-r27/4.4/debian-10/Dockerfile)
 * [`4.2`, `4.2-debian-10`, `4.2.11`, `4.2.11-debian-10-r26` (4.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.2.11-debian-10-r26/4.2/debian-10/Dockerfile)
 * [`4.0`, `4.0-debian-9`, `4.0.21`, `4.0.21-debian-9-r34` (4.0/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.0.21-debian-9-r34/4.0/debian-9/Dockerfile)
-* [`3.6`, `3.6-debian-9`, `3.6.21`, `3.6.21-debian-9-r32` (3.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/3.6.21-debian-9-r32/3.6/debian-9/Dockerfile)
+* [`3.6`, `3.6-debian-9`, `3.6.21`, `3.6.21-debian-9-r33` (3.6/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/3.6.21-debian-9-r33/3.6/debian-9/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/mongodb GitHub repo](https://github.com/bitnami/bitnami-docker-mongodb).