diff --git a/Dockerfile b/Dockerfile
index 7be0d0a39..1c94e8c6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,7 +22,7 @@ RUN set -x \
     && apk del .build-dependencies
 
 # Some setup tools need to be kept
-RUN apk add --no-cache su-exec
+RUN apk add --no-cache su-exec shadow
 
 # Bundle app source
 COPY . .
diff --git a/start-docker.sh b/start-docker.sh
index e214560ea..dd27c5cb9 100755
--- a/start-docker.sh
+++ b/start-docker.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
+[[ ! -z "${USER_UID}" ]] && usermod -u ${USER_UID} node || echo "No USER_UID specified, leaving 1000"
+[[ ! -z "${USER_GID}" ]] && groupmod -g ${USER_GID} node || echo "No USER_GID specified, leaving 1000"
+
 chown -R node:node /home/node
 su-exec node node ./src/www