diff --git a/bitnami/postgresql/11/debian-10/Dockerfile b/bitnami/postgresql/11/debian-10/Dockerfile
index 47257b410a8c..c5419c0d6cd1 100644
--- a/bitnami/postgresql/11/debian-10/Dockerfile
+++ b/bitnami/postgresql/11/debian-10/Dockerfile
@@ -24,7 +24,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="11.10.0-debian-10-r15" \
+    BITNAMI_IMAGE_VERSION="11.10.0-debian-10-r16" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 8bb4a8cb1627..0404dd601f6a 100644
--- a/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql/11/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -370,7 +370,6 @@ postgresql_get_major_version() {
     psql --version | grep -oE "[0-9]+\.[0-9]+" | grep -oE "^[0-9]+"
 }
 
-
 ########################
 # Change postgresql.conf by setting replication parameters
 # Globals:
@@ -394,7 +393,6 @@ postgresql_configure_replication_parameters() {
     postgresql_set_property "hot_standby" "on"
 }
 
-
 ########################
 # Change postgresql.conf by setting parameters for synchronous replication
 # Globals:
@@ -411,7 +409,6 @@ postgresql_configure_synchronous_replication() {
     fi
 }
 
-
 ########################
 # Change postgresql.conf by setting TLS properies
 # Globals:
@@ -637,7 +634,7 @@ postgresql_initialize() {
             postgresql_configure_recovery
         fi
     fi
-     # TLS Modifications on pghba need to be performed after properly configuring postgresql.conf file
+    # TLS Modifications on pghba need to be performed after properly configuring postgresql.conf file
     is_boolean_yes "$create_pghba_file" && is_boolean_yes "$POSTGRESQL_ENABLE_TLS" && [[ -n $POSTGRESQL_TLS_CA_FILE ]] && postgresql_tls_auth_configuration
 
     is_boolean_yes "$create_conf_file" && [[ -n "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES" ]] && postgresql_set_property "shared_preload_libraries" "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES"
@@ -728,9 +725,9 @@ postgresql_stop() {
     if [[ -f "$POSTGRESQL_PID_FILE" ]]; then
         info "Stopping PostgreSQL..."
         if am_i_root; then
-          gosu "$POSTGRESQL_DAEMON_USER" "${cmd[@]}"
+            gosu "$POSTGRESQL_DAEMON_USER" "${cmd[@]}"
         else
-          "${cmd[@]}"
+            "${cmd[@]}"
         fi
     fi
 }
@@ -796,7 +793,10 @@ postgresql_start_bg() {
     else
         "${pg_ctl_cmd[@]}" "start" "${pg_ctl_flags[@]}" >/dev/null 2>&1
     fi
-    local -r pg_isready_args=("-U" "postgres")
+    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
@@ -928,7 +928,6 @@ postgresql_slave_init_db() {
     done
 }
 
-
 ########################
 # Create recovery.conf in slave node
 # Globals:
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index 8288466b544d..133c23ff6409 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -46,7 +46,7 @@ Learn more about the Bitnami tagging policy and the difference between rolling t
 
 * [`13`, `13-debian-10`, `13.1.0`, `13.1.0-debian-10-r14` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.1.0-debian-10-r14/13/debian-10/Dockerfile)
 * [`12`, `12-debian-10`, `12.5.0`, `12.5.0-debian-10-r14` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.5.0-debian-10-r14/12/debian-10/Dockerfile)
-* [`11`, `11-debian-10`, `11.10.0`, `11.10.0-debian-10-r15`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.10.0-debian-10-r15/11/debian-10/Dockerfile)
+* [`11`, `11-debian-10`, `11.10.0`, `11.10.0-debian-10-r16`, `latest` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.10.0-debian-10-r16/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.15.0`, `10.15.0-debian-10-r14` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.15.0-debian-10-r14/10/debian-10/Dockerfile)
 * [`9.6`, `9.6-debian-10`, `9.6.20`, `9.6.20-debian-10-r14` (9.6/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/9.6.20-debian-10-r14/9.6/debian-10/Dockerfile)