diff --git a/9.5/Dockerfile b/9.5/Dockerfile
index 6ee68e41c9..43d7a3d1ca 100644
--- a/9.5/Dockerfile
+++ b/9.5/Dockerfile
@@ -12,7 +12,9 @@ RUN set -ex; \
 	fi
 
 # explicitly set user/group IDs
-RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
+#RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1001 postgres
+#RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1001 postgres
+RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=1000080001 postgres
 
 # grab gosu for easy step-down from root
 ENV GOSU_VERSION 1.7
@@ -73,6 +75,7 @@ VOLUME /var/lib/postgresql/data
 
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh / # backwards compat
+USER 1000080001
 ENTRYPOINT ["docker-entrypoint.sh"]
 
 EXPOSE 5432