diff --git a/bitnami/postgresql/13/debian-10/Dockerfile b/bitnami/postgresql/13/debian-10/Dockerfile
index 71c996e349ea..3e1aa2d7dce7 100644
--- a/bitnami/postgresql/13/debian-10/Dockerfile
+++ b/bitnami/postgresql/13/debian-10/Dockerfile
@@ -9,7 +9,7 @@ ENV HOME="/" \
 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 libnettle6 libp11-kit0 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" "13.1.0-6" --checksum 65894746a9e5876b62c298a25b52d6bcdc8933b142bdd0f0af2beae6624ac9c6
+RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "postgresql" "13.1.0-8" --checksum 858e6757a55b9ffcd46054126a93f70c3c150661e0903a1ddd0af97a69059dfc
 RUN . /opt/bitnami/scripts/libcomponent.sh && component_unpack "gosu" "1.12.0-2" --checksum 4d858ac600c38af8de454c27b7f65c0074ec3069880cb16d259a6e40a46bbc50
 RUN apt-get update && apt-get upgrade -y && \
     rm -r /var/lib/apt/lists /var/cache/apt/archives
@@ -24,10 +24,9 @@ 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.1.0-debian-10-r60" \
+    BITNAMI_IMAGE_VERSION="13.1.0-debian-10-r61" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
-    LD_LIBRARY_PATH="/opt/bitnami/postgresql/lib/:/opt/bitnami/common/lib/:$LD_LIBRARY_PATH" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
     PATH="/opt/bitnami/postgresql/bin:/opt/bitnami/common/bin:$PATH"
 
diff --git a/bitnami/postgresql/13/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/postgresql/13/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
index 80a6ce10bda1..6bf789700d43 100644
--- a/bitnami/postgresql/13/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/postgresql/13/debian-10/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -8,9 +8,9 @@
     },
     "postgresql": {
         "arch": "amd64",
-        "digest": "65894746a9e5876b62c298a25b52d6bcdc8933b142bdd0f0af2beae6624ac9c6",
+        "digest": "858e6757a55b9ffcd46054126a93f70c3c150661e0903a1ddd0af97a69059dfc",
         "distro": "debian-10",
         "type": "NAMI",
-        "version": "13.1.0-6"
+        "version": "13.1.0-8"
     }
 }
\ No newline at end of file
diff --git a/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 21babc244f00..7a5da689e54b 100644
--- a/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -794,9 +794,6 @@ postgresql_start_bg() {
         "${pg_ctl_cmd[@]}" "start" "${pg_ctl_flags[@]}" >/dev/null 2>&1
     fi
     local pg_isready_args=("-U" "postgres")
-    if [[ "$POSTGRESQL_PORT_NUMBER" != "5432" ]]; then
-        pg_isready_args+=("-p" "$POSTGRESQL_PORT_NUMBER")
-    fi
     local counter=$POSTGRESQL_INIT_MAX_TIMEOUT
     while ! "$POSTGRESQL_BIN_DIR"/pg_isready "${pg_isready_args[@]}" >/dev/null 2>&1; do
         sleep 1
diff --git a/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh b/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh
index 78b0788d23bf..f270af9c4ff0 100755
--- a/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh
+++ b/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/postgresql/postunpack.sh
@@ -9,7 +9,7 @@
 # Load PostgreSQL environment variables
 . /opt/bitnami/scripts/postgresql-env.sh
 
-for dir in "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "${POSTGRESQL_MOUNTED_CONF_DIR}" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR"; do
+for dir in "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "$POSTGRESQL_MOUNTED_CONF_DIR" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR"; do
     ensure_dir_exists "$dir"
 done
 
@@ -18,7 +18,7 @@ postgresql_allow_local_connection
 # Create basic postgresql.conf
 postgresql_create_config
 
-chmod -R g+rwX "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "${POSTGRESQL_MOUNTED_CONF_DIR}" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR"
+chmod -R g+rwX "$POSTGRESQL_INITSCRIPTS_DIR" "$POSTGRESQL_TMP_DIR" "$POSTGRESQL_LOG_DIR" "$POSTGRESQL_CONF_DIR" "${POSTGRESQL_CONF_DIR}/conf.d" "$POSTGRESQL_MOUNTED_CONF_DIR" "${POSTGRESQL_MOUNTED_CONF_DIR}/conf.d" "$POSTGRESQL_VOLUME_DIR"
 
 # Redirect all logging to stdout
 ln -sf /dev/stdout "$POSTGRESQL_LOG_DIR/postgresql.log"
diff --git a/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/postgresql/run-autoctl.sh b/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/postgresql/run-autoctl.sh
index 9f0a50214e85..5adfc907c099 100755
--- a/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/postgresql/run-autoctl.sh
+++ b/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/postgresql/run-autoctl.sh
@@ -15,16 +15,16 @@ set -o pipefail
 # Load PostgreSQL environment variables
 . /opt/bitnami/scripts/postgresql-env.sh
 
-export HOME="${POSTGRESQL_AUTOCTL_VOLUME_DIR}"
+export HOME="$POSTGRESQL_AUTOCTL_VOLUME_DIR"
 
 autoctl_initialize
 
-flags=("run" "--pgdata" "${POSTGRESQL_DATA_DIR}")
+flags=("run" "--pgdata" "$POSTGRESQL_DATA_DIR")
 cmd=$(command -v pg_autoctl)
 
 info "** Starting PostgreSQL autoctl_node (Mode: $POSTGRESQL_AUTOCTL_MODE) **"
 if am_i_root; then
-    exec gosu "$POSTGRESQL_DAEMON_USER" "${cmd}" "${flags[@]}"
+    exec gosu "$POSTGRESQL_DAEMON_USER" "$cmd" "${flags[@]}"
 else
-    PGPASSWORD=${POSTGRESQL_REPLICATION_PASSWORD} exec "${cmd}" "${flags[@]}"
+    PGPASSWORD=$POSTGRESQL_REPLICATION_PASSWORD exec "$cmd" "${flags[@]}"
 fi
diff --git a/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/postgresql/run.sh b/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/postgresql/run.sh
index 5d7a359d4a12..a84454655f70 100755
--- a/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/postgresql/run.sh
+++ b/bitnami/postgresql/13/debian-10/rootfs/opt/bitnami/scripts/postgresql/run.sh
@@ -19,7 +19,7 @@ cmd=$(command -v postgres)
 
 info "** Starting PostgreSQL **"
 if am_i_root; then
-    exec gosu "$POSTGRESQL_DAEMON_USER" "${cmd}" "${flags[@]}"
+    exec gosu "$POSTGRESQL_DAEMON_USER" "$cmd" "${flags[@]}"
 else
-    exec "${cmd}" "${flags[@]}"
+    exec "$cmd" "${flags[@]}"
 fi
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index 61b1525140d2..8f89fd43bce2 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -44,7 +44,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/).
 
 
-* [`13`, `13-debian-10`, `13.1.0`, `13.1.0-debian-10-r60` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.1.0-debian-10-r60/13/debian-10/Dockerfile)
+* [`13`, `13-debian-10`, `13.1.0`, `13.1.0-debian-10-r61` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.1.0-debian-10-r61/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.5.0`, `12.5.0-debian-10-r60` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.5.0-debian-10-r60/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.10.0`, `11.10.0-debian-10-r61`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.10.0-debian-10-r61/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.15.0`, `10.15.0-debian-10-r60` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.15.0-debian-10-r60/10/debian-10/Dockerfile)