diff --git a/Dockerfile b/Dockerfile
index 9ee053f60..2074f946a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,13 +11,9 @@ WORKDIR ${HEIMDALL_DIR}
 COPY . .
 
 RUN make install
-RUN groupadd -g 20137 heimdall \
-    && useradd -u 20137 --no-log-init --create-home -r -g heimdall heimdall \
-    && chown -R heimdall:heimdall ${HEIMDALL_DIR}
 
 COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
 
-USER heimdall
 ENV SHELL /bin/bash
 EXPOSE 1317 26656 26657
 
diff --git a/Dockerfile.release b/Dockerfile.release
index d073e7a67..bdb57ef1b 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -13,14 +13,9 @@ COPY heimdalld /usr/bin/
 COPY heimdallcli /usr/bin/
 COPY builder/files/genesis-mainnet-v1.json ${HEIMDALL_DIR}/
 COPY builder/files/genesis-testnet-v4.json ${HEIMDALL_DIR}/
-RUN groupadd -g 20137 heimdall \
-    && useradd -u 20137 --no-log-init --create-home -r -g heimdall heimdall \
-    && chown -R heimdall:heimdall ${HEIMDALL_DIR}
 
 COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
 
-USER heimdall
-
 EXPOSE 1317 26656 26657
 
 ENTRYPOINT ["entrypoint.sh"]