diff --git a/percona-distribution-postgresql-12/Dockerfile b/percona-distribution-postgresql-12/Dockerfile
index 5c3796bd..e7740e53 100644
--- a/percona-distribution-postgresql-12/Dockerfile
+++ b/percona-distribution-postgresql-12/Dockerfile
@@ -5,9 +5,13 @@ LABEL org.opencontainers.image.authors="info@percona.com"
 RUN microdnf -y update; \
     microdnf -y install glibc-langpack-en
 
-ENV PPG_VERSION 12.17-1
+ENV PPG_VERSION 12.19-1
+ENV PPG_MAJOR_VERSION 12
+ENV PPG_MINOR_VERSION 19
 ENV OS_VER el8
-ENV FULL_PERCONA_VERSION "$PPG_VERSION.$OS_VER"
+ENV FULL_PERCONA_VERSION "${PPG_VERSION}.${OS_VER}"
+ENV PPG_REPO testing
+ENV PPG_REPO_VERSION "${PPG_MAJOR_VERSION}.${PPG_MINOR_VERSION}"
 
 # Do not report during Docker image creation.
 # Note that doing so, would create telemetry config file
@@ -29,8 +33,8 @@ RUN set -ex; \
     rpm -i /tmp/percona-release.rpm; \
     rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \
     rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY; \
-    #percona-release setup -y ppg12; \
-    percona-release enable ppg-12.17 testing;
+    #percona-release setup -y ppg${PPG_MAJOR_VERSION}; \
+    percona-release enable ppg-${PPG_REPO_VERSION} ${PPG_REPO};
 
 RUN set -ex; \
     microdnf -y update; \
@@ -64,24 +68,24 @@ ENV PGDATA /data/db
 
 RUN set -ex; \
     microdnf install -y \
-        percona-postgresql12-server-${FULL_PERCONA_VERSION} \
-        percona-postgresql12-contrib-${FULL_PERCONA_VERSION} \
+        percona-postgresql${PPG_MAJOR_VERSION}-server-${FULL_PERCONA_VERSION} \
+        percona-postgresql${PPG_MAJOR_VERSION}-contrib-${FULL_PERCONA_VERSION} \
         percona-postgresql-common \
-        percona-pg_stat_monitor12 \
-        percona-pg_repack12 \
-        percona-pgaudit12 \
-        percona-pgaudit12_set_user \
-        percona-wal2json12; \
+        percona-pg_stat_monitor${PPG_MAJOR_VERSION} \
+        percona-pg_repack${PPG_MAJOR_VERSION} \
+        percona-pgaudit${PPG_MAJOR_VERSION} \
+        percona-pgaudit${PPG_MAJOR_VERSION}_set_user \
+        percona-wal2json${PPG_MAJOR_VERSION}; \
     microdnf clean all; \
     rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
     chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
 
 RUN set -ex; \
-    sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-12/share/postgresql.conf.sample; \
-    grep -F "listen_addresses = '*'" /usr/pgsql-12/share/postgresql.conf.sample
+    sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-${PPG_MAJOR_VERSION}/share/postgresql.conf.sample; \
+    grep -F "listen_addresses = '*'" /usr/pgsql-${PPG_MAJOR_VERSION}/share/postgresql.conf.sample
 
 COPY LICENSE /licenses/LICENSE.Dockerfile
-RUN cp /usr/share/doc/percona-postgresql12/COPYRIGHT /licenses/COPYRIGHT.PostgreSQL
+RUN cp /usr/share/doc/percona-postgresql${PPG_MAJOR_VERSION}/COPYRIGHT /licenses/COPYRIGHT.PostgreSQL
 
 ENV GOSU_VERSION=1.11
 RUN set -eux; \
diff --git a/percona-distribution-postgresql-13/Dockerfile b/percona-distribution-postgresql-13/Dockerfile
index 77a96fad..6c918963 100644
--- a/percona-distribution-postgresql-13/Dockerfile
+++ b/percona-distribution-postgresql-13/Dockerfile
@@ -5,9 +5,13 @@ LABEL org.opencontainers.image.authors="info@percona.com"
 RUN microdnf -y update; \
     microdnf -y install glibc-langpack-en
 
-ENV PPG_VERSION 13.13-1
+ENV PPG_VERSION 13.15-1
+ENV PPG_MAJOR_VERSION 13
+ENV PPG_MINOR_VERSION 15
 ENV OS_VER el8
-ENV FULL_PERCONA_VERSION "$PPG_VERSION.$OS_VER"
+ENV FULL_PERCONA_VERSION "${PPG_VERSION}.${OS_VER}"
+ENV PPG_REPO testing
+ENV PPG_REPO_VERSION "${PPG_MAJOR_VERSION}.${PPG_MINOR_VERSION}"
 
 # Do not report during Docker image creation.
 # Note that doing so, would create telemetry config file
@@ -29,8 +33,8 @@ RUN set -ex; \
     rpm -i /tmp/percona-release.rpm; \
     rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \
     rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY; \
-    #percona-release setup -y ppg13; \
-    percona-release enable ppg-13.13 testing;
+    #percona-release setup -y ppg${PPG_MAJOR_VERSION}; \
+    percona-release enable ppg-${PPG_REPO_VERSION} ${PPG_REPO};
 
 RUN set -ex; \
     microdnf -y update; \
@@ -64,24 +68,24 @@ ENV PGDATA /data/db
 
 RUN set -ex; \
     microdnf install -y \
-        percona-postgresql13-server-${FULL_PERCONA_VERSION} \
-        percona-postgresql13-contrib-${FULL_PERCONA_VERSION} \
+        percona-postgresql${PPG_MAJOR_VERSION}-server-${FULL_PERCONA_VERSION} \
+        percona-postgresql${PPG_MAJOR_VERSION}-contrib-${FULL_PERCONA_VERSION} \
         percona-postgresql-common \
-        percona-pg_stat_monitor13 \
-        percona-pg_repack13 \
-        percona-pgaudit13 \
-        percona-pgaudit13_set_user \
-        percona-wal2json13; \
+        percona-pg_stat_monitor${PPG_MAJOR_VERSION} \
+        percona-pg_repack${PPG_MAJOR_VERSION} \
+        percona-pgaudit${PPG_MAJOR_VERSION} \
+        percona-pgaudit${PPG_MAJOR_VERSION}_set_user \
+        percona-wal2json${PPG_MAJOR_VERSION}; \
     microdnf clean all; \
     rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
     chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
 
 RUN set -ex; \
-    sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-13/share/postgresql.conf.sample; \
-    grep -F "listen_addresses = '*'" /usr/pgsql-13/share/postgresql.conf.sample
+    sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-${PPG_MAJOR_VERSION}/share/postgresql.conf.sample; \
+    grep -F "listen_addresses = '*'" /usr/pgsql-${PPG_MAJOR_VERSION}/share/postgresql.conf.sample
 
 COPY LICENSE /licenses/LICENSE.Dockerfile
-RUN cp /usr/share/doc/percona-postgresql13/COPYRIGHT /licenses/COPYRIGHT.PostgreSQL
+RUN cp /usr/share/doc/percona-postgresql${PPG_MAJOR_VERSION}/COPYRIGHT /licenses/COPYRIGHT.PostgreSQL
 
 ENV GOSU_VERSION=1.11
 RUN set -eux; \
diff --git a/percona-distribution-postgresql-14/Dockerfile b/percona-distribution-postgresql-14/Dockerfile
index 7d030d59..07c5e506 100644
--- a/percona-distribution-postgresql-14/Dockerfile
+++ b/percona-distribution-postgresql-14/Dockerfile
@@ -5,9 +5,13 @@ LABEL org.opencontainers.image.authors="info@percona.com"
 RUN microdnf -y update; \
     microdnf -y install glibc-langpack-en
 
-ENV PPG_VERSION 14.10-1
+ENV PPG_VERSION 14.12-1
+ENV PPG_MAJOR_VERSION 14
+ENV PPG_MINOR_VERSION 12
 ENV OS_VER el8
-ENV FULL_PERCONA_VERSION "$PPG_VERSION.$OS_VER"
+ENV FULL_PERCONA_VERSION "${PPG_VERSION}.${OS_VER}"
+ENV PPG_REPO testing
+ENV PPG_REPO_VERSION "${PPG_MAJOR_VERSION}.${PPG_MINOR_VERSION}"
 
 # Do not report during Docker image creation.
 # Note that doing so, would create telemetry config file
@@ -29,8 +33,8 @@ RUN set -ex; \
     rpm -i /tmp/percona-release.rpm; \
     rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \
     rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY; \
-    #percona-release setup -y ppg14; \
-    percona-release enable ppg-14.10 testing; 
+    #percona-release setup -y ppg${PPG_MAJOR_VERSION}; \
+    percona-release enable ppg-${PPG_REPO_VERSION} ${PPG_REPO};
 
 RUN set -ex; \
     microdnf -y update; \
@@ -64,24 +68,24 @@ ENV PGDATA /data/db
 
 RUN set -ex; \
     microdnf install -y \
-        percona-postgresql14-server-${FULL_PERCONA_VERSION} \
-        percona-postgresql14-contrib-${FULL_PERCONA_VERSION} \
+        percona-postgresql${PPG_MAJOR_VERSION}-server-${FULL_PERCONA_VERSION} \
+        percona-postgresql${PPG_MAJOR_VERSION}-contrib-${FULL_PERCONA_VERSION} \
         percona-postgresql-common \
-        percona-pg_stat_monitor14 \
-        percona-pg_repack14 \
-        percona-pgaudit14 \
-        percona-pgaudit14_set_user \
-        percona-wal2json14; \
+        percona-pg_stat_monitor${PPG_MAJOR_VERSION} \
+        percona-pg_repack${PPG_MAJOR_VERSION} \
+        percona-pgaudit${PPG_MAJOR_VERSION} \
+        percona-pgaudit${PPG_MAJOR_VERSION}_set_user \
+        percona-wal2json${PPG_MAJOR_VERSION}; \
     microdnf clean all; \
     rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
     chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
 
 RUN set -ex; \
-    sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-14/share/postgresql.conf.sample; \
-    grep -F "listen_addresses = '*'" /usr/pgsql-14/share/postgresql.conf.sample
+    sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-${PPG_MAJOR_VERSION}/share/postgresql.conf.sample; \
+    grep -F "listen_addresses = '*'" /usr/pgsql-${PPG_MAJOR_VERSION}/share/postgresql.conf.sample
 
 COPY LICENSE /licenses/LICENSE.Dockerfile
-RUN cp /usr/share/doc/percona-postgresql14/COPYRIGHT /licenses/COPYRIGHT.PostgreSQL
+RUN cp /usr/share/doc/percona-postgresql${PPG_MAJOR_VERSION}/COPYRIGHT /licenses/COPYRIGHT.PostgreSQL
 
 ENV GOSU_VERSION=1.11
 RUN set -eux; \
diff --git a/percona-distribution-postgresql-15/Dockerfile b/percona-distribution-postgresql-15/Dockerfile
index 2875f1cc..a3e85ae6 100644
--- a/percona-distribution-postgresql-15/Dockerfile
+++ b/percona-distribution-postgresql-15/Dockerfile
@@ -5,9 +5,13 @@ LABEL org.opencontainers.image.authors="info@percona.com"
 RUN dnf -y update; \
     dnf -y install glibc-langpack-en
 
-ENV PPG_VERSION 15.5-1
+ENV PPG_VERSION 15.7-1
+ENV PPG_MAJOR_VERSION 15
+ENV PPG_MINOR_VERSION 7
 ENV OS_VER el9
-ENV FULL_PERCONA_VERSION "$PPG_VERSION.$OS_VER"
+ENV FULL_PERCONA_VERSION "${PPG_VERSION}.${OS_VER}"
+ENV PPG_REPO testing
+ENV PPG_REPO_VERSION "${PPG_MAJOR_VERSION}.${PPG_MINOR_VERSION}"
 
 # Do not report during Docker image creation.
 # Note that doing so, would create telemetry config file
@@ -29,8 +33,8 @@ RUN set -ex; \
     rpm -i /tmp/percona-release.rpm; \
     rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \
     rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY; \
-    #percona-release setup -y ppg15; \
-    percona-release enable ppg-15.5 testing; 
+    #percona-release setup -y ppg${PPG_MAJOR_VERSION}; \
+    percona-release enable ppg-${PPG_REPO_VERSION} ${PPG_REPO};
 
 RUN set -ex; \
     dnf -y update; \
@@ -58,24 +62,24 @@ ENV PGDATA /data/db
 
 RUN set -ex; \
     dnf install -y \
-        percona-postgresql15-server-${FULL_PERCONA_VERSION} \
-        percona-postgresql15-contrib-${FULL_PERCONA_VERSION} \
+        percona-postgresql${PPG_MAJOR_VERSION}-server-${FULL_PERCONA_VERSION} \
+        percona-postgresql${PPG_MAJOR_VERSION}-contrib-${FULL_PERCONA_VERSION} \
         percona-postgresql-common \
-        percona-pg_stat_monitor15 \
-        percona-pg_repack15 \
-        percona-pgaudit15 \
-        percona-pgaudit15_set_user \
-        percona-wal2json15; \
+        percona-pg_stat_monitor${PPG_MAJOR_VERSION} \
+        percona-pg_repack${PPG_MAJOR_VERSION} \
+        percona-pgaudit${PPG_MAJOR_VERSION} \
+        percona-pgaudit${PPG_MAJOR_VERSION}_set_user \
+        percona-wal2json${PPG_MAJOR_VERSION}; \
     dnf clean all; \
     rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
     chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
 
 RUN set -ex; \
-    sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-15/share/postgresql.conf.sample; \
-    grep -F "listen_addresses = '*'" /usr/pgsql-15/share/postgresql.conf.sample
+    sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-${PPG_MAJOR_VERSION}/share/postgresql.conf.sample; \
+    grep -F "listen_addresses = '*'" /usr/pgsql-${PPG_MAJOR_VERSION}/share/postgresql.conf.sample
 
 COPY LICENSE /licenses/LICENSE.Dockerfile
-RUN cp /usr/share/doc/percona-postgresql15/COPYRIGHT /licenses/COPYRIGHT.PostgreSQL
+RUN cp /usr/share/doc/percona-postgresql${PPG_MAJOR_VERSION}/COPYRIGHT /licenses/COPYRIGHT.PostgreSQL
 
 ENV GOSU_VERSION=1.11
 RUN set -eux; \
diff --git a/percona-distribution-postgresql-16/Dockerfile b/percona-distribution-postgresql-16/Dockerfile
index 8ca041a5..d15ffbbd 100644
--- a/percona-distribution-postgresql-16/Dockerfile
+++ b/percona-distribution-postgresql-16/Dockerfile
@@ -5,9 +5,13 @@ LABEL org.opencontainers.image.authors="info@percona.com"
 RUN dnf -y update; \
     dnf -y install glibc-langpack-en
 
-ENV PPG_VERSION 16.1-2
+ENV PPG_VERSION 16.3-1
+ENV PPG_MAJOR_VERSION 16
+ENV PPG_MINOR_VERSION 3
 ENV OS_VER el9
-ENV FULL_PERCONA_VERSION "$PPG_VERSION.$OS_VER"
+ENV FULL_PERCONA_VERSION "${PPG_VERSION}.${OS_VER}"
+ENV PPG_REPO testing
+ENV PPG_REPO_VERSION "${PPG_MAJOR_VERSION}.${PPG_MINOR_VERSION}"
 
 # Do not report during Docker image creation.
 # Note that doing so, would create telemetry config file
@@ -29,8 +33,8 @@ RUN set -ex; \
     rpm -i /tmp/percona-release.rpm; \
     rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \
     rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY; \
-    #percona-release setup -y ppg16; \
-    percona-release enable ppg-16.1 testing; 
+    #percona-release setup -y ppg${PPG_MAJOR_VERSION}; \
+    percona-release enable ppg-${PPG_REPO_VERSION} ${PPG_REPO};
 
 RUN set -ex; \
     dnf -y update; \
@@ -58,24 +62,24 @@ ENV PGDATA /data/db
 
 RUN set -ex; \
     dnf install -y \
-        percona-postgresql16-server-${FULL_PERCONA_VERSION} \
-        percona-postgresql16-contrib-${FULL_PERCONA_VERSION} \
+        percona-postgresql${PPG_MAJOR_VERSION}-server-${FULL_PERCONA_VERSION} \
+        percona-postgresql${PPG_MAJOR_VERSION}-contrib-${FULL_PERCONA_VERSION} \
         percona-postgresql-common \
-        percona-pg_stat_monitor16 \
-        percona-pg_repack16 \
-        percona-pgaudit16 \
-        percona-pgaudit16_set_user \
-        percona-wal2json16; \
+        percona-pg_stat_monitor${PPG_MAJOR_VERSION} \
+        percona-pg_repack${PPG_MAJOR_VERSION} \
+        percona-pgaudit${PPG_MAJOR_VERSION} \
+        percona-pgaudit${PPG_MAJOR_VERSION}_set_user \
+        percona-wal2json${PPG_MAJOR_VERSION}; \
     dnf clean all; \
     rm -rf /var/cache/dnf /var/cache/yum $PGDATA && mkdir -p $PGDATA /docker-entrypoint-initdb.d; \
     chown -R 1001:0 $PGDATA docker-entrypoint-initdb.d
 
 RUN set -ex; \
-    sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-16/share/postgresql.conf.sample; \
-    grep -F "listen_addresses = '*'" /usr/pgsql-16/share/postgresql.conf.sample
+    sed -ri "s!^#?(listen_addresses)\s*=\s*\S+.*!\1 = '*'!" /usr/pgsql-${PPG_MAJOR_VERSION}/share/postgresql.conf.sample; \
+    grep -F "listen_addresses = '*'" /usr/pgsql-${PPG_MAJOR_VERSION}/share/postgresql.conf.sample
 
 COPY LICENSE /licenses/LICENSE.Dockerfile
-RUN cp /usr/share/doc/percona-postgresql16/COPYRIGHT /licenses/COPYRIGHT.PostgreSQL
+RUN cp /usr/share/doc/percona-postgresql${PPG_MAJOR_VERSION}/COPYRIGHT /licenses/COPYRIGHT.PostgreSQL
 
 ENV GOSU_VERSION=1.11
 RUN set -eux; \