diff --git a/bitnami/postgresql/12/debian-10/Dockerfile b/bitnami/postgresql/12/debian-10/Dockerfile
index 678e35f388fa..ec7e18d55439 100644
--- a/bitnami/postgresql/12/debian-10/Dockerfile
+++ b/bitnami/postgresql/12/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="12.10.0-debian-10-r24" \
+    BITNAMI_IMAGE_VERSION="12.10.0-debian-10-r25" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
     NSS_WRAPPER_LIB="/opt/bitnami/common/lib/libnss_wrapper.so" \
diff --git a/bitnami/postgresql/12/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh b/bitnami/postgresql/12/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
index 6b1a5ec93ed5..86dde44b77a7 100644
--- a/bitnami/postgresql/12/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
+++ b/bitnami/postgresql/12/debian-10/rootfs/opt/bitnami/scripts/libpostgresql.sh
@@ -158,6 +158,8 @@ postgresql_validate() {
 postgresql_create_config() {
     info "postgresql.conf file not detected. Generating it..."
     cp "$POSTGRESQL_BASE_DIR/share/postgresql.conf.sample" "$POSTGRESQL_CONF_FILE"
+    # Configure port
+    postgresql_set_property "port" "$POSTGRESQL_PORT_NUMBER"
     # Update default value for 'include_dir' directive
     # ref: https://github.com/postgres/postgres/commit/fb9c475597c245562a28d1e916b575ac4ec5c19f#diff-f5544d9b6d218cc9677524b454b41c60
     if ! grep include_dir "$POSTGRESQL_CONF_FILE" >/dev/null; then
@@ -765,7 +767,7 @@ postgresql_start_bg() {
     else
         "${pg_ctl_cmd[@]}" "start" "${pg_ctl_flags[@]}" >/dev/null 2>&1
     fi
-    local pg_isready_args=("-U" "postgres")
+    local pg_isready_args=("-U" "postgres" "-p" "$POSTGRESQL_PORT_NUMBER")
     local counter=$POSTGRESQL_INIT_MAX_TIMEOUT
     while ! "$POSTGRESQL_BIN_DIR"/pg_isready "${pg_isready_args[@]}" >/dev/null 2>&1; do
         sleep 1
@@ -1043,7 +1045,7 @@ postgresql_execute_print_output() {
     local opts
     read -r -a opts <<<"${@:4}"
 
-    local args=("-U" "$user")
+    local args=("-U" "$user" "-p" "$POSTGRESQL_PORT_NUMBER")
     [[ -n "$db" ]] && args+=("-d" "$db")
     [[ "${#opts[@]}" -gt 0 ]] && args+=("${opts[@]}")
 
@@ -1272,7 +1274,6 @@ EOF
     fi
 }
 
-
 ########################
 # Retrieves the WAL directory in use by PostgreSQL / to use if not initialized yet
 # Globals:
diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md
index 595719034699..16953e1d63d6 100644
--- a/bitnami/postgresql/README.md
+++ b/bitnami/postgresql/README.md
@@ -52,7 +52,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-r24`, `latest` (14/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/14.2.0-debian-10-r24/14/debian-10/Dockerfile)
 * [`13`, `13-debian-10`, `13.6.0`, `13.6.0-debian-10-r25` (13/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/13.6.0-debian-10-r25/13/debian-10/Dockerfile)
-* [`12`, `12-debian-10`, `12.10.0`, `12.10.0-debian-10-r24` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.10.0-debian-10-r24/12/debian-10/Dockerfile)
+* [`12`, `12-debian-10`, `12.10.0`, `12.10.0-debian-10-r25` (12/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/12.10.0-debian-10-r25/12/debian-10/Dockerfile)
 * [`11`, `11-debian-10`, `11.15.0`, `11.15.0-debian-10-r25` (11/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/11.15.0-debian-10-r25/11/debian-10/Dockerfile)
 * [`10`, `10-debian-10`, `10.20.0`, `10.20.0-debian-10-r24` (10/debian-10/Dockerfile)](https://github.com/bitnami/bitnami-docker-postgresql/blob/10.20.0-debian-10-r24/10/debian-10/Dockerfile)