diff --git a/1.7.1/Dockerfile b/1.7.1/Dockerfile
index 25cbceb..da36f22 100644
--- a/1.7.1/Dockerfile
+++ b/1.7.1/Dockerfile
@@ -16,7 +16,7 @@ MAINTAINER CouchDB Developers dev@couchdb.apache.org
 
 # Install instructions from https://cwiki.apache.org/confluence/display/COUCHDB/Debian
 
-RUN groupadd -r couchdb && useradd -d /var/lib/couchdb -g couchdb couchdb
+RUN groupadd -g 5984 -r couchdb && useradd -u 5984 -d /opt/couchdb -g couchdb couchdb
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
     ca-certificates \
diff --git a/2.1.1/Dockerfile b/2.1.1/Dockerfile
index f6b8060..1ffb317 100644
--- a/2.1.1/Dockerfile
+++ b/2.1.1/Dockerfile
@@ -15,7 +15,7 @@ FROM debian:jessie
 MAINTAINER CouchDB Developers dev@couchdb.apache.org
 
 # Add CouchDB user account
-RUN groupadd -r couchdb && useradd -d /opt/couchdb -g couchdb couchdb
+RUN groupadd -g 5984 -r couchdb && useradd -u 5984 -d /opt/couchdb -g couchdb couchdb
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
     ca-certificates \
diff --git a/dev/Dockerfile b/dev/Dockerfile
index 5dcf2a7..8b4a733 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -16,7 +16,7 @@ MAINTAINER CouchDB Developers dev@couchdb.apache.org
 
 ENV COUCHDB_VERSION master
 
-RUN groupadd -r couchdb && useradd -d /usr/src/couchdb -g couchdb couchdb
+RUN groupadd -g 5984 -r couchdb && useradd -u 5984 -d /opt/couchdb -g couchdb couchdb
 
 # download dependencies
 RUN apt-get update -y -qq && apt-get install -y --no-install-recommends \