diff --git a/percona-distribution-postgresql-11/Dockerfile b/percona-distribution-postgresql-11/Dockerfile
index 9ed428fd..f93023b0 100644
--- a/percona-distribution-postgresql-11/Dockerfile
+++ b/percona-distribution-postgresql-11/Dockerfile
@@ -60,6 +60,8 @@ RUN set -ex; \
     rpmkeys --checksig /tmp/perl-JSON.rpm; \
     rpm -i /tmp/perl-JSON.rpm
 
+ENV PGDATA /data/db
+
 RUN set -ex; \
     microdnf install -y \
         percona-postgresql11-server-${FULL_PERCONA_VERSION} \
@@ -71,8 +73,8 @@ RUN set -ex; \
         percona-pgaudit11_set_user \
         percona-wal2json11; \
     microdnf clean all; \
-    rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
-    chown -R 1001:0 /data/db docker-entrypoint-initdb.d
+    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-11/share/postgresql.conf.sample; \
diff --git a/percona-distribution-postgresql-12/Dockerfile b/percona-distribution-postgresql-12/Dockerfile
index 6447369f..5c3796bd 100644
--- a/percona-distribution-postgresql-12/Dockerfile
+++ b/percona-distribution-postgresql-12/Dockerfile
@@ -60,6 +60,8 @@ RUN set -ex; \
     rpmkeys --checksig /tmp/perl-JSON.rpm; \
     rpm -i /tmp/perl-JSON.rpm
 
+ENV PGDATA /data/db
+
 RUN set -ex; \
     microdnf install -y \
         percona-postgresql12-server-${FULL_PERCONA_VERSION} \
@@ -71,8 +73,8 @@ RUN set -ex; \
         percona-pgaudit12_set_user \
         percona-wal2json12; \
     microdnf clean all; \
-    rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
-    chown -R 1001:0 /data/db docker-entrypoint-initdb.d
+    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; \
diff --git a/percona-distribution-postgresql-13/Dockerfile b/percona-distribution-postgresql-13/Dockerfile
index 19242a06..77a96fad 100644
--- a/percona-distribution-postgresql-13/Dockerfile
+++ b/percona-distribution-postgresql-13/Dockerfile
@@ -60,6 +60,8 @@ RUN set -ex; \
     rpmkeys --checksig /tmp/perl-JSON.rpm; \
     rpm -i /tmp/perl-JSON.rpm
 
+ENV PGDATA /data/db
+
 RUN set -ex; \
     microdnf install -y \
         percona-postgresql13-server-${FULL_PERCONA_VERSION} \
@@ -71,8 +73,8 @@ RUN set -ex; \
         percona-pgaudit13_set_user \
         percona-wal2json13; \
     microdnf clean all; \
-    rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
-    chown -R 1001:0 /data/db docker-entrypoint-initdb.d
+    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; \
diff --git a/percona-distribution-postgresql-14/Dockerfile b/percona-distribution-postgresql-14/Dockerfile
index 948b526a..7d030d59 100644
--- a/percona-distribution-postgresql-14/Dockerfile
+++ b/percona-distribution-postgresql-14/Dockerfile
@@ -60,6 +60,8 @@ RUN set -ex; \
     rpmkeys --checksig /tmp/perl-JSON.rpm; \
     rpm -i /tmp/perl-JSON.rpm
 
+ENV PGDATA /data/db
+
 RUN set -ex; \
     microdnf install -y \
         percona-postgresql14-server-${FULL_PERCONA_VERSION} \
@@ -71,8 +73,8 @@ RUN set -ex; \
         percona-pgaudit14_set_user \
         percona-wal2json14; \
     microdnf clean all; \
-    rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
-    chown -R 1001:0 /data/db docker-entrypoint-initdb.d
+    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; \
diff --git a/percona-distribution-postgresql-15/Dockerfile b/percona-distribution-postgresql-15/Dockerfile
index 7175a246..2875f1cc 100644
--- a/percona-distribution-postgresql-15/Dockerfile
+++ b/percona-distribution-postgresql-15/Dockerfile
@@ -54,6 +54,8 @@ RUN set -ex; \
 RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
             -c "Default Application User" postgres
 
+ENV PGDATA /data/db
+
 RUN set -ex; \
     dnf install -y \
         percona-postgresql15-server-${FULL_PERCONA_VERSION} \
@@ -65,8 +67,8 @@ RUN set -ex; \
         percona-pgaudit15_set_user \
         percona-wal2json15; \
     dnf clean all; \
-    rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
-    chown -R 1001:0 /data/db docker-entrypoint-initdb.d
+    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; \
diff --git a/percona-distribution-postgresql-15/Dockerfile-ol8 b/percona-distribution-postgresql-15/Dockerfile-ol8
index 1a652d55..3f55ddfd 100644
--- a/percona-distribution-postgresql-15/Dockerfile-ol8
+++ b/percona-distribution-postgresql-15/Dockerfile-ol8
@@ -60,6 +60,8 @@ RUN set -ex; \
     rpmkeys --checksig /tmp/perl-JSON.rpm; \
     rpm -i /tmp/perl-JSON.rpm
 
+ENV PGDATA /data/db
+
 RUN set -ex; \
     microdnf install -y \
         percona-postgresql15-server-${FULL_PERCONA_VERSION} \
@@ -71,8 +73,8 @@ RUN set -ex; \
         percona-pgaudit15_set_user \
         percona-wal2json15; \
     microdnf clean all; \
-    rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
-    chown -R 1001:0 /data/db docker-entrypoint-initdb.d
+    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; \
diff --git a/percona-distribution-postgresql-15/Dockerfile-ol9 b/percona-distribution-postgresql-15/Dockerfile-ol9
index f502528c..4a4bd432 100644
--- a/percona-distribution-postgresql-15/Dockerfile-ol9
+++ b/percona-distribution-postgresql-15/Dockerfile-ol9
@@ -54,6 +54,8 @@ RUN set -ex; \
 RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
             -c "Default Application User" postgres
 
+ENV PGDATA /data/db
+
 RUN set -ex; \
     dnf install -y \
         percona-postgresql15-server-${FULL_PERCONA_VERSION} \
@@ -65,8 +67,8 @@ RUN set -ex; \
         percona-pgaudit15_set_user \
         percona-wal2json15; \
     dnf clean all; \
-    rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
-    chown -R 1001:0 /data/db docker-entrypoint-initdb.d
+    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; \
diff --git a/percona-distribution-postgresql-16/Dockerfile b/percona-distribution-postgresql-16/Dockerfile
index a5c076eb..8ca041a5 100644
--- a/percona-distribution-postgresql-16/Dockerfile
+++ b/percona-distribution-postgresql-16/Dockerfile
@@ -54,6 +54,8 @@ RUN set -ex; \
 RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
             -c "Default Application User" postgres
 
+ENV PGDATA /data/db
+
 RUN set -ex; \
     dnf install -y \
         percona-postgresql16-server-${FULL_PERCONA_VERSION} \
@@ -65,8 +67,8 @@ RUN set -ex; \
         percona-pgaudit16_set_user \
         percona-wal2json16; \
     dnf clean all; \
-    rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
-    chown -R 1001:0 /data/db docker-entrypoint-initdb.d
+    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; \
diff --git a/percona-distribution-postgresql-16/Dockerfile-ol9 b/percona-distribution-postgresql-16/Dockerfile-ol9
index be5b6b99..eacba294 100644
--- a/percona-distribution-postgresql-16/Dockerfile-ol9
+++ b/percona-distribution-postgresql-16/Dockerfile-ol9
@@ -54,6 +54,8 @@ RUN set -ex; \
 RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
             -c "Default Application User" postgres
 
+ENV PGDATA /data/db
+
 RUN set -ex; \
     dnf install -y \
         percona-postgresql16-server-${FULL_PERCONA_VERSION} \
@@ -65,8 +67,8 @@ RUN set -ex; \
         percona-pgaudit16_set_user \
         percona-wal2json16; \
     dnf clean all; \
-    rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
-    chown -R 1001:0 /data/db docker-entrypoint-initdb.d
+    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; \
diff --git a/percona-distribution-postgresql-16/Dockerfile_back b/percona-distribution-postgresql-16/Dockerfile_back
index dcb53429..9f114aa8 100644
--- a/percona-distribution-postgresql-16/Dockerfile_back
+++ b/percona-distribution-postgresql-16/Dockerfile_back
@@ -60,6 +60,8 @@ RUN set -ex; \
     rpmkeys --checksig /tmp/perl-JSON.rpm; \
     rpm -i /tmp/perl-JSON.rpm
 
+ENV PGDATA /data/db
+
 RUN set -ex; \
     microdnf install -y \
         percona-postgresql16-server-${FULL_PERCONA_VERSION} \
@@ -71,8 +73,8 @@ RUN set -ex; \
         percona-pgaudit16_set_user \
         percona-wal2json16; \
     microdnf clean all; \
-    rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db /docker-entrypoint-initdb.d; \
-    chown -R 1001:0 /data/db docker-entrypoint-initdb.d
+    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; \