diff --git a/6-jre7/Dockerfile b/6-jre7/Dockerfile
index 25baf2103..299e6da04 100644
--- a/6-jre7/Dockerfile
+++ b/6-jre7/Dockerfile
@@ -1,13 +1,9 @@
 FROM java:7-jre
 
-# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r tomcat && useradd -r --create-home -g tomcat tomcat
-
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
-RUN mkdir -p "$CATALINA_HOME" && chown tomcat:tomcat "$CATALINA_HOME"
+RUN mkdir -p "$CATALINA_HOME"
 WORKDIR $CATALINA_HOME
-USER tomcat
 
 # see https://www.apache.org/dist/tomcat/tomcat-8/KEYS
 RUN gpg --keyserver pgp.mit.edu --recv-keys \
diff --git a/6-jre8/Dockerfile b/6-jre8/Dockerfile
index b4730864f..54c2bd00a 100644
--- a/6-jre8/Dockerfile
+++ b/6-jre8/Dockerfile
@@ -1,13 +1,9 @@
 FROM java:8-jre
 
-# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r tomcat && useradd -r --create-home -g tomcat tomcat
-
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
-RUN mkdir -p "$CATALINA_HOME" && chown tomcat:tomcat "$CATALINA_HOME"
+RUN mkdir -p "$CATALINA_HOME"
 WORKDIR $CATALINA_HOME
-USER tomcat
 
 # see https://www.apache.org/dist/tomcat/tomcat-8/KEYS
 RUN gpg --keyserver pgp.mit.edu --recv-keys \
diff --git a/7-jre7/Dockerfile b/7-jre7/Dockerfile
index 9d3bc1903..464d06382 100644
--- a/7-jre7/Dockerfile
+++ b/7-jre7/Dockerfile
@@ -1,13 +1,9 @@
 FROM java:7-jre
 
-# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r tomcat && useradd -r --create-home -g tomcat tomcat
-
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
-RUN mkdir -p "$CATALINA_HOME" && chown tomcat:tomcat "$CATALINA_HOME"
+RUN mkdir -p "$CATALINA_HOME"
 WORKDIR $CATALINA_HOME
-USER tomcat
 
 # see https://www.apache.org/dist/tomcat/tomcat-8/KEYS
 RUN gpg --keyserver pgp.mit.edu --recv-keys \
diff --git a/7-jre8/Dockerfile b/7-jre8/Dockerfile
index ed44cda12..f7a97a8c9 100644
--- a/7-jre8/Dockerfile
+++ b/7-jre8/Dockerfile
@@ -1,13 +1,9 @@
 FROM java:8-jre
 
-# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r tomcat && useradd -r --create-home -g tomcat tomcat
-
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
-RUN mkdir -p "$CATALINA_HOME" && chown tomcat:tomcat "$CATALINA_HOME"
+RUN mkdir -p "$CATALINA_HOME"
 WORKDIR $CATALINA_HOME
-USER tomcat
 
 # see https://www.apache.org/dist/tomcat/tomcat-8/KEYS
 RUN gpg --keyserver pgp.mit.edu --recv-keys \
diff --git a/8-jre7/Dockerfile b/8-jre7/Dockerfile
index 3af9ba927..926603d93 100644
--- a/8-jre7/Dockerfile
+++ b/8-jre7/Dockerfile
@@ -1,13 +1,9 @@
 FROM java:7-jre
 
-# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r tomcat && useradd -r --create-home -g tomcat tomcat
-
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
-RUN mkdir -p "$CATALINA_HOME" && chown tomcat:tomcat "$CATALINA_HOME"
+RUN mkdir -p "$CATALINA_HOME"
 WORKDIR $CATALINA_HOME
-USER tomcat
 
 # see https://www.apache.org/dist/tomcat/tomcat-8/KEYS
 RUN gpg --keyserver pgp.mit.edu --recv-keys \
diff --git a/8-jre8/Dockerfile b/8-jre8/Dockerfile
index 3fd25ae9f..80e82ca43 100644
--- a/8-jre8/Dockerfile
+++ b/8-jre8/Dockerfile
@@ -1,13 +1,9 @@
 FROM java:8-jre
 
-# add our user and group first to make sure their IDs get assigned consistently, regardless of whatever dependencies get added
-RUN groupadd -r tomcat && useradd -r --create-home -g tomcat tomcat
-
 ENV CATALINA_HOME /usr/local/tomcat
 ENV PATH $CATALINA_HOME/bin:$PATH
-RUN mkdir -p "$CATALINA_HOME" && chown tomcat:tomcat "$CATALINA_HOME"
+RUN mkdir -p "$CATALINA_HOME"
 WORKDIR $CATALINA_HOME
-USER tomcat
 
 # see https://www.apache.org/dist/tomcat/tomcat-8/KEYS
 RUN gpg --keyserver pgp.mit.edu --recv-keys \