diff --git a/bitnami/postgresql/13/debian-10/Dockerfile b/bitnami/postgresql/13/debian-10/Dockerfile
index 9ae8b55a85d4..5b4563574d74 100644
--- a/bitnami/postgresql/13/debian-10/Dockerfile
+++ b/bitnami/postgresql/13/debian-10/Dockerfile
@@ -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="13.6.0-debian-10-r11" \
+    BITNAMI_IMAGE_VERSION="13.6.0-debian-10-r12" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql/13/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh b/bitnami/postgresql/13/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
index 1b504b1df458..21b964ff1cf4 100644
--- a/bitnami/postgresql/13/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
+++ b/bitnami/postgresql/13/debian-10/prebuildfs/opt/bitnami/scripts/libfs.sh
@@ -74,8 +74,9 @@ is_dir_empty() {
 #   boolean
 #########################
 is_mounted_dir_empty() {
-    local dir="${1:?missing directory}"
-
+    local -r path="${1:?missing directory}"
+    # Calculate real path in order to avoid issues with symlinks
+    local -r dir="$(realpath "$path")"
     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 4e0b64b3ea08..e22913f8fd99 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -51,7 +51,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 
 * [`14`, `14-debian-10`, `14.2.0`, `14.2.0-debian-10-r10`, `latest` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/14.2.0-debian-10-r10/14/debian-10/Dockerfile)
-* [`13`, `13-debian-10`, `13.6.0`, `13.6.0-debian-10-r11` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.6.0-debian-10-r11/13/debian-10/Dockerfile)
+* [`13`, `13-debian-10`, `13.6.0`, `13.6.0-debian-10-r12` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.6.0-debian-10-r12/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.10.0`, `12.10.0-debian-10-r11` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.10.0-debian-10-r11/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.15.0`, `11.15.0-debian-10-r11` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.15.0-debian-10-r11/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.20.0`, `10.20.0-debian-10-r11` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.20.0-debian-10-r11/10/debian-10/Dockerfile)