diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
index 7ac2223ab1..6017d60df5 100644
--- a/apps/web/Dockerfile
+++ b/apps/web/Dockerfile
@@ -67,6 +67,7 @@ EXPOSE 5000
 
 RUN apk add --no-cache curl \
     icu-libs \
+    shadow \
     && apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community gosu
 
 # Copy app from the build stage
diff --git a/apps/web/entrypoint.sh b/apps/web/entrypoint.sh
index 72fd2b43b1..96bb777353 100644
--- a/apps/web/entrypoint.sh
+++ b/apps/web/entrypoint.sh
@@ -22,10 +22,11 @@ fi
 if [ "$(id -u)" = "0" ]; then
     # Create user and group
 
-    addgroup -g "$LGID" -S "$GROUPNAME" 2>/dev/null || true
-    adduser -u "$LUID" -G "$GROUPNAME" -S -D -H "$USERNAME" 2>/dev/null || true
-    mkdir -p /home/$USERNAME
-    chown $USERNAME:$GROUPNAME /home/$USERNAME
+    groupadd -o -g $LGID $GROUPNAME >/dev/null 2>&1 ||
+    groupmod -o -g $LGID $GROUPNAME >/dev/null 2>&1
+    useradd -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1 ||
+    usermod -o -u $LUID -g $GROUPNAME -s /bin/false $USERNAME >/dev/null 2>&1
+    mkhomedir_helper $USERNAME
 
     # The rest...