diff --git a/docker/Dockerfile b/docker/Dockerfile
index a444c0b..18c418f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -40,7 +40,7 @@ COPY --from=0 /usr/local/ /usr/local/
 
 # Install dependencies
 RUN apt-get update \
-	&& apt-get install -yq --no-install-suggests --no-install-recommends python-setuptools moreutils \
+	&& apt-get install -yq --no-install-suggests --no-install-recommends python-setuptools moreutils gosu \
 	&& rm -rf /var/lib/apt/lists/*
 
 # Create a user
@@ -50,7 +50,7 @@ RUN addgroup --gid $USER_GID bitmessage ;\
 WORKDIR ${HOME}
 
 # Generate default config
-RUN pybitmessage -t
+RUN su bitmessage -c "pybitmessage -t"
 
 # Setup environment
 CMD chown bitmessage:bitmessage keys.dat; chmod 600 keys.dat; \
@@ -64,8 +64,8 @@ CMD chown bitmessage:bitmessage keys.dat; chmod 600 keys.dat; \
           	-e "s|\(ttl = \).*|\1$BITMESSAGE_TTL|g" \
           	-e "s|\(stopresendingafterxdays = \).*|\1$BITMESSAGE_STOPRESENDINGAFTERXDAYS|g" \
           	-e "s|\(udp = \).*|\1False|g" | \
-	    sponge keys.dat && \
-	su bitmessage -c "exec pybitmessage -d"
+	    gosu bitmessage sponge keys.dat && \
+  exec gosu bitmessage pybitmessage -d
 
 # Generate Deterministic address
 HEALTHCHECK --retries=3 --interval=15s \