diff --git a/10/Dockerfile b/10/Dockerfile
index c2a841772f..2104e6e375 100644
--- a/10/Dockerfile
+++ b/10/Dockerfile
@@ -11,11 +11,13 @@ RUN set -ex; \
 		rm -rf /var/lib/apt/lists/*; \
 	fi
 
+ENV GID 999
+ENV UID 999
 # explicitly set user/group IDs
 RUN set -eux; \
-	groupadd -r postgres --gid=999; \
+	groupadd -r postgres --gid=$GID; \
 # https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
-	useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
+	useradd -r -g postgres --uid=$UID --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
 # also create the postgres user's home directory with appropriate permissions
 # see https://github.com/docker-library/postgres/issues/274
 	mkdir -p /var/lib/postgresql; \
diff --git a/11/Dockerfile b/11/Dockerfile
index 792bc262ea..b4b11c5e70 100644
--- a/11/Dockerfile
+++ b/11/Dockerfile
@@ -11,11 +11,13 @@ RUN set -ex; \
 		rm -rf /var/lib/apt/lists/*; \
 	fi
 
+ENV GID 999
+ENV UID 999
 # explicitly set user/group IDs
 RUN set -eux; \
-	groupadd -r postgres --gid=999; \
+	groupadd -r postgres --gid=$GID; \
 # https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
-	useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
+	useradd -r -g postgres --uid=$UID --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
 # also create the postgres user's home directory with appropriate permissions
 # see https://github.com/docker-library/postgres/issues/274
 	mkdir -p /var/lib/postgresql; \
diff --git a/12/Dockerfile b/12/Dockerfile
index e8d188449e..1ed2c5b762 100644
--- a/12/Dockerfile
+++ b/12/Dockerfile
@@ -11,11 +11,13 @@ RUN set -ex; \
 		rm -rf /var/lib/apt/lists/*; \
 	fi
 
+ENV GID 999
+ENV UID 999
 # explicitly set user/group IDs
 RUN set -eux; \
-	groupadd -r postgres --gid=999; \
+	groupadd -r postgres --gid=$GID; \
 # https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
-	useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
+	useradd -r -g postgres --uid=$UID --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
 # also create the postgres user's home directory with appropriate permissions
 # see https://github.com/docker-library/postgres/issues/274
 	mkdir -p /var/lib/postgresql; \
diff --git a/13/Dockerfile b/13/Dockerfile
index 07c7252365..5ff7a8ea4f 100644
--- a/13/Dockerfile
+++ b/13/Dockerfile
@@ -11,11 +11,13 @@ RUN set -ex; \
 		rm -rf /var/lib/apt/lists/*; \
 	fi
 
+ENV GID 999
+ENV UID 999
 # explicitly set user/group IDs
 RUN set -eux; \
-	groupadd -r postgres --gid=999; \
+	groupadd -r postgres --gid=$GID; \
 # https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
-	useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
+	useradd -r -g postgres --uid=$UID --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
 # also create the postgres user's home directory with appropriate permissions
 # see https://github.com/docker-library/postgres/issues/274
 	mkdir -p /var/lib/postgresql; \
diff --git a/9.5/Dockerfile b/9.5/Dockerfile
index 092a6b623e..b1634072cd 100644
--- a/9.5/Dockerfile
+++ b/9.5/Dockerfile
@@ -11,11 +11,13 @@ RUN set -ex; \
 		rm -rf /var/lib/apt/lists/*; \
 	fi
 
+ENV GID 999
+ENV UID 999
 # explicitly set user/group IDs
 RUN set -eux; \
-	groupadd -r postgres --gid=999; \
+	groupadd -r postgres --gid=$GID; \
 # https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
-	useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
+	useradd -r -g postgres --uid=$UID --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
 # also create the postgres user's home directory with appropriate permissions
 # see https://github.com/docker-library/postgres/issues/274
 	mkdir -p /var/lib/postgresql; \
diff --git a/9.6/Dockerfile b/9.6/Dockerfile
index 3a3d9bcd00..c2787e3309 100644
--- a/9.6/Dockerfile
+++ b/9.6/Dockerfile
@@ -11,11 +11,13 @@ RUN set -ex; \
 		rm -rf /var/lib/apt/lists/*; \
 	fi
 
+ENV GID 999
+ENV UID 999
 # explicitly set user/group IDs
 RUN set -eux; \
-	groupadd -r postgres --gid=999; \
+	groupadd -r postgres --gid=$GID; \
 # https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
-	useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
+	useradd -r -g postgres --uid=$UID --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
 # also create the postgres user's home directory with appropriate permissions
 # see https://github.com/docker-library/postgres/issues/274
 	mkdir -p /var/lib/postgresql; \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index 876229be59..3a56111c26 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -10,12 +10,14 @@ RUN set -ex; \
 		; \
 		rm -rf /var/lib/apt/lists/*; \
 	fi
-
+	
+ENV GID 999
+ENV UID 999
 # explicitly set user/group IDs
 RUN set -eux; \
-	groupadd -r postgres --gid=999; \
+	groupadd -r postgres --gid=$GID; \
 # https://salsa.debian.org/postgresql/postgresql-common/blob/997d842ee744687d99a2b2d95c1083a2615c79e8/debian/postgresql-common.postinst#L32-35
-	useradd -r -g postgres --uid=999 --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
+	useradd -r -g postgres --uid=$UID --home-dir=/var/lib/postgresql --shell=/bin/bash postgres; \
 # also create the postgres user's home directory with appropriate permissions
 # see https://github.com/docker-library/postgres/issues/274
 	mkdir -p /var/lib/postgresql; \