diff --git a/postgresql-containers/build/pgbackrest-repo/Dockerfile b/postgresql-containers/build/pgbackrest-repo/Dockerfile
index d1823f33..a862a026 100644
--- a/postgresql-containers/build/pgbackrest-repo/Dockerfile
+++ b/postgresql-containers/build/pgbackrest-repo/Dockerfile
@@ -111,15 +111,8 @@ COPY --from=go_builder /licenses /licenses
 COPY bin/common /opt/crunchy/bin
 COPY bin/pgbackrest-common /opt/crunchy/bin
 
-# only PG16 is affected PG-794
-RUN if [[ "${PG_MAJOR//.}" -le '15' ]]; then \
-        groupadd postgres -g 26; \
-        useradd postgres -u 26 -g 26; \
-    else \
-        usermod -d /home/postgres postgres; \
-    fi
-
 RUN set -ex; \
+    usermod -d /home/postgres postgres; \
     groupadd pgbackrest -g 2000; \
     useradd pgbackrest -u 2000 -g 2000
 
diff --git a/postgresql-containers/build/pgbackrest/Dockerfile b/postgresql-containers/build/pgbackrest/Dockerfile
index eca9e189..fcca51d8 100644
--- a/postgresql-containers/build/pgbackrest/Dockerfile
+++ b/postgresql-containers/build/pgbackrest/Dockerfile
@@ -102,15 +102,8 @@ RUN set -ex; \
         percona-pgbackrest; \
     microdnf -y clean all
 
-# only PG16 is affected PG-794
-RUN if [[ "${PG_MAJOR//.}" -le '15' ]]; then \
-        groupadd postgres -g 26; \
-        useradd postgres -u 26 -g 26; \
-    else \
-        usermod -d /home/postgres postgres; \
-    fi
-
 RUN set -ex; \
+    usermod -d /home/postgres postgres; \
     mkdir -p /opt/crunchy/bin /opt/crunchy/conf /pgdata /backrestrepo \
              /var/log/pgbackrest