diff --git a/bitnami/postgresql/10/debian-10/Dockerfile b/bitnami/postgresql/10/debian-10/Dockerfile
index e250f6187f56..2776af93a05b 100644
--- a/bitnami/postgresql/10/debian-10/Dockerfile
+++ b/bitnami/postgresql/10/debian-10/Dockerfile
@@ -12,8 +12,8 @@ ARG WITH_ALL_LOCALES="no"
 COPY prebuildfs /
 # Install required system packages and dependencies
 RUN install_packages acl ca-certificates curl gzip libbsd0 libbz2-1.0 libc6 libedit2 libffi6 libgcc1 libgmp10 libgnutls30 libhogweed4 libicu63 libidn2-0 libldap-2.4-2 liblz4-1 liblzma5 libncurses6 libnettle6 libp11-kit0 libpcre3 libreadline7 libsasl2-2 libsqlite3-0 libssl1.1 libstdc++6 libtasn1-6 libtinfo6 libunistring2 libuuid1 libxml2 libxslt1.1 libzstd1 locales procps tar zlib1g
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql" "10.20.0-5" --checksum df6326c9166de51ff625e1232e1bbeac40f2dda734deb8961fa3004cc1464bf1
-RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-6" --checksum 6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql" "10.20.0-6" --checksum 716f7b139476e31186b7cfb6ec3d10e37c411ddb1945eb134bfb0bc7a7174598
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.14.0-7" --checksum d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
 RUN chmod g+rwX /opt/bitnami
@@ -27,7 +27,7 @@ COPY rootfs /
 RUN /opt/bitnami/scripts/postgresql/postunpack.sh
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 ENV BITNAMI_APP_NAME="postgresql" \
-    BITNAMI_IMAGE_VERSION="10.20.0-debian-10-r17" \
+    BITNAMI_IMAGE_VERSION="10.20.0-debian-10-r18" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index 709f5cae4f26..50937a0138c2 100644
--- a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -1,16 +1,16 @@
 {
     "gosu": {
         "arch": "amd64",
-        "digest": "6f8fd2267481ffbe899a7f93b7b3076cd78dd70b7b9835bed79414932a749664",
+        "digest": "d6280b6f647a62bf6edc74dc8e526bfff63ddd8067dcb8540843f47203d9ccf1",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "1.14.0-6"
+        "version": "1.14.0-7"
     },
     "postgresql": {
         "arch": "amd64",
-        "digest": "df6326c9166de51ff625e1232e1bbeac40f2dda734deb8961fa3004cc1464bf1",
+        "digest": "716f7b139476e31186b7cfb6ec3d10e37c411ddb1945eb134bfb0bc7a7174598",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "10.20.0-5"
+        "version": "10.20.0-6"
     }
 }
\ No newline at end of file
diff --git a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 21b964ff1cf4..1b504b1df458 100644
--- a/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/postgresql/10/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -74,9 +74,8 @@ is_dir_empty() {
 #   boolean
 #########################
 is_mounted_dir_empty() {
-    local -r path="${1:?missing directory}"
-    # Calculate real path in order to avoid issues with symlinks
-    local -r dir="$(realpath "$path")"
+    local dir="${1:?missing directory}"
+
     if is_dir_empty "$dir" || find "$dir" -mindepth 1 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" -exec false {} +; then
         true
     else
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index 8e543625da7a..7cb17177b4f1 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -54,7 +54,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 * [`13`, `13-debian-10`, `13.6.0`, `13.6.0-debian-10-r17` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.6.0-debian-10-r17/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.10.0`, `12.10.0-debian-10-r17` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.10.0-debian-10-r17/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.15.0`, `11.15.0-debian-10-r17` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.15.0-debian-10-r17/11/debian-10/Dockerfile)
-* [`10`, `10-debian-10`, `10.20.0`, `10.20.0-debian-10-r17` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.20.0-debian-10-r17/10/debian-10/Dockerfile)
+* [`10`, `10-debian-10`, `10.20.0`, `10.20.0-debian-10-r18` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.20.0-debian-10-r18/10/debian-10/Dockerfile)
 
 Subscribe to project updates by watching the [bitnami/postgresql GitHub repo](https://github.com/bitnami/bitnami-docker-postgresql).