diff --git a/bitnami/mongodb/3.6/ol-7/Dockerfile b/bitnami/mongodb/3.6/ol-7/Dockerfile
index a10813f38a2d..48d091876d42 100644
--- a/bitnami/mongodb/3.6/ol-7/Dockerfile
+++ b/bitnami/mongodb/3.6/ol-7/Dockerfile
@@ -25,7 +25,7 @@ RUN curl --silent -L https://github.com/mikefarah/yq/releases/download/2.4.0/yq_
 COPY rootfs /
 RUN /postunpack.sh
 ENV BITNAMI_APP_NAME="mongodb" \
-    BITNAMI_IMAGE_VERSION="3.6.17-ol-7-r19" \
+    BITNAMI_IMAGE_VERSION="3.6.17-ol-7-r20" \
     NAMI_PREFIX="/.nami" \
     PATH="/opt/bitnami/mongodb/bin:$PATH"
 
diff --git a/bitnami/mongodb/3.6/ol-7/rootfs/libmongodb.sh b/bitnami/mongodb/3.6/ol-7/rootfs/libmongodb.sh
index ba62a87280c8..8bd38421f9dc 100644
--- a/bitnami/mongodb/3.6/ol-7/rootfs/libmongodb.sh
+++ b/bitnami/mongodb/3.6/ol-7/rootfs/libmongodb.sh
@@ -552,7 +552,7 @@ mongodb_create_keyfile() {
     local -r key="${1:?key is required}"
 
     if ! mongodb_is_file_external "keyfile"; then
-        info "Writing keyfile for replica set authentication: $key $MONGODB_KEY_FILE"
+        info "Writing keyfile for replica set authentication..."
         echo "$key" > "$MONGODB_KEY_FILE"
 
         chmod 600 "$MONGODB_KEY_FILE"
diff --git a/bitnami/mongodb/3.6/ol-7/rootfs/postunpack.sh b/bitnami/mongodb/3.6/ol-7/rootfs/postunpack.sh
index 8bc90f926f64..2d037d2c75f8 100755
--- a/bitnami/mongodb/3.6/ol-7/rootfs/postunpack.sh
+++ b/bitnami/mongodb/3.6/ol-7/rootfs/postunpack.sh
@@ -9,10 +9,10 @@
 # Load MongoDB env. variables
 eval "$(mongodb_env)"
 
-for dir in "$MONGODB_TMP_DIR" "$MONGODB_LOG_DIR" "$MONGODB_CONF_DIR" "$MONGODB_DATA_DIR" "$MONGODB_VOLUME_DIR"; do
+for dir in "$MONGODB_TMP_DIR" "$MONGODB_LOG_DIR" "$MONGODB_CONF_DIR" "$MONGODB_DATA_DIR" "$MONGODB_VOLUME_DIR" "$MONGODB_INITSCRIPTS_DIR"; do
     ensure_dir_exists "$dir"
 done
-chmod -R g+rwX "$MONGODB_TMP_DIR" "$MONGODB_LOG_DIR" "$MONGODB_CONF_DIR" "$MONGODB_DATA_DIR" "$MONGODB_VOLUME_DIR"
+chmod -R g+rwX "$MONGODB_TMP_DIR" "$MONGODB_LOG_DIR" "$MONGODB_CONF_DIR" "$MONGODB_DATA_DIR" "$MONGODB_VOLUME_DIR" "$MONGODB_INITSCRIPTS_DIR"
 
 # Create .dbshell file to avoid error message
 touch /.dbshell && chmod g+rw /.dbshell
diff --git a/bitnami/mongodb/README.md b/bitnami/mongodb/README.md
index fdb6fba19483..4700488ef282 100644
--- a/bitnami/mongodb/README.md
+++ b/bitnami/mongodb/README.md
@@ -51,9 +51,9 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`4.2-ol-7`, `4.2.3-ol-7-r20` (4.2/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.2.3-ol-7-r20/4.2/ol-7/Dockerfile)
 * [`4.2-debian-10`, `4.2.3-debian-10-r22`, `4.2`, `4.2.3` (4.2/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.2.3-debian-10-r22/4.2/debian-10/Dockerfile)
 * [`4.0-ol-7`, `4.0.16-ol-7-r15` (4.0/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/4.0.16-ol-7-r15/4.0/ol-7/Dockerfile)
-* [`3.6-ol-7`, `3.6.17-ol-7-r19` (3.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/3.6.17-ol-7-r19/3.6/ol-7/Dockerfile)
-* [`3.6-debian-10`, `0.0.0-debian-10-r0`, `3.6`, `0.0.0` (3.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/0.0.0-debian-10-r0/3.6/debian-10/Dockerfile)
+* [`3.6-ol-7`, `3.6.17-ol-7-r20` (3.6/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/3.6.17-ol-7-r20/3.6/ol-7/Dockerfile)
 * [`4.0-debian-10`, `0.0.0-debian-10-r0`, `4.0`, `0.0.0`, `latest` (4.0/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/0.0.0-debian-10-r0/4.0/debian-10/Dockerfile)
+* [`3.6-debian-10`, `0.0.0-debian-10-r0`, `3.6`, `0.0.0` (3.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-mongodb/blob/0.0.0-debian-10-r0/3.6/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/mongodb GitHub repo](https://github.com/bitnami/bitnami-docker-mongodb).