diff --git a/entrypoint.sh b/entrypoint.sh
index 7c614e96e3..92e3aa887d 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,20 +1,28 @@
 #!/bin/bash
 
-NOUSER=`id -u bitwarden > /dev/null 2>&1; echo $?`
+USERNAME="bitwarden"
+NOUSER=`id -u $USERNAME > /dev/null 2>&1; echo $?`
 LUID=${LOCAL_UID:-999}
-if [ $NOUSER == 0 ] && [ `id -u bitwarden` != $LUID ]
+
+# Step down from host root
+if [ $LUID == 0 ]
 then
-    usermod -u $LUID bitwarden
-elif [ $NOUSER == 1 ]
-then
-    useradd -r -u $LUID -g bitwarden bitwarden
+    LUID=999
 fi
 
-chown -R bitwarden:bitwarden /etc/bitwarden
+if [ $NOUSER == 0 ] && [ `id -u $USERNAME` != $LUID ]
+then
+    usermod -u $LUID $USERNAME
+elif [ $NOUSER == 1 ]
+then
+    useradd -r -u $LUID -g $USERNAME $USERNAME
+fi
+
+chown -R $USERNAME:$USERNAME /etc/bitwarden
 cp /etc/bitwarden/web/settings.js /app/js/settings.js
 cp /etc/bitwarden/web/app-id.json /app/app-id.json
-chown -R bitwarden:bitwarden /app
-chown -R bitwarden:bitwarden /bitwarden_server
+chown -R $USERNAME:$USERNAME /app
+chown -R $USERNAME:$USERNAME /bitwarden_server
 
-gosu bitwarden:bitwarden dotnet /bitwarden_server/Server.dll \
+gosu $USERNAME:$USERNAME dotnet /bitwarden_server/Server.dll \
     /contentRoot=/app /webRoot=. /serveUnknown=false