diff --git a/3.6/Dockerfile b/3.6/Dockerfile
index 7077676598..b5d53ee538 100644
--- a/3.6/Dockerfile
+++ b/3.6/Dockerfile
@@ -1,7 +1,9 @@
 FROM ubuntu:xenial
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mongodb && useradd -r -g mongodb mongodb
+RUN set -ex; \
+	groupadd --system mongodb; \
+	useradd --system --gid mongodb --home-dir /var/mongodb --create-home mongodb
 
 RUN set -eux; \
 	apt-get update; \
diff --git a/4.0/Dockerfile b/4.0/Dockerfile
index 116dcbe297..d558903dda 100644
--- a/4.0/Dockerfile
+++ b/4.0/Dockerfile
@@ -1,7 +1,9 @@
 FROM ubuntu:xenial
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mongodb && useradd -r -g mongodb mongodb
+RUN set -ex; \
+	groupadd --system mongodb; \
+	useradd --system --gid mongodb --home-dir /var/mongodb --create-home mongodb
 
 RUN set -eux; \
 	apt-get update; \
diff --git a/4.2/Dockerfile b/4.2/Dockerfile
index ac91b935d9..a5e474da4f 100644
--- a/4.2/Dockerfile
+++ b/4.2/Dockerfile
@@ -1,7 +1,9 @@
 FROM ubuntu:bionic
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mongodb && useradd -r -g mongodb mongodb
+RUN set -ex; \
+	groupadd --system mongodb; \
+	useradd --system --gid mongodb --home-dir /var/mongodb --create-home mongodb
 
 RUN set -eux; \
 	apt-get update; \
diff --git a/4.4/Dockerfile b/4.4/Dockerfile
index 805bfc0001..09f2b5eacd 100644
--- a/4.4/Dockerfile
+++ b/4.4/Dockerfile
@@ -1,7 +1,9 @@
 FROM ubuntu:bionic
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mongodb && useradd -r -g mongodb mongodb
+RUN set -ex; \
+	groupadd --system mongodb; \
+	useradd --system --gid mongodb --home-dir /var/mongodb --create-home mongodb
 
 RUN set -eux; \
 	apt-get update; \
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
index 3c42d04827..9807c43f09 100644
--- a/Dockerfile-linux.template
+++ b/Dockerfile-linux.template
@@ -1,7 +1,9 @@
 FROM placeholder
 
 # add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r mongodb && useradd -r -g mongodb mongodb
+RUN set -ex; \
+	groupadd --system mongodb; \
+	useradd --system --gid mongodb --home-dir /var/mongodb --create-home mongodb
 
 RUN set -eux; \
 	apt-get update; \