diff --git a/app/Dockerfile b/app/Dockerfile
index ef36916..5894d0c 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -17,6 +17,8 @@ RUN set -ex \
   # 82 is the standard uid/gid for "www-data" in Alpine
   && addgroup -g 82 -S www-data \
   && adduser -u 82 -D -S -G www-data www-data \
+  && addgroup -S bookstack \
+  && adduser -S -D -H -s /sbin/nologin  -G bookstack  -g bookstack bookstack \
   && apk update \
   && echo "Setting up PHP extensions" \
   && apk add --no-cache \
@@ -73,7 +75,7 @@ RUN set -ex \
   && echo "Get Dependencies:" \
   && composer install \
   && echo "Changing ownership:" \
-  && chown www-data:www-data -R . \
+  && chown bookstack:bookstack -R . \
   && echo "Ensure www-data got access to Nginx folders:" \
   && chown www-data:www-data -R /var/lib/nginx /var/log/nginx
 
diff --git a/app/docker-entrypoint.sh b/app/docker-entrypoint.sh
index 6225ede..699f305 100644
--- a/app/docker-entrypoint.sh
+++ b/app/docker-entrypoint.sh
@@ -6,8 +6,8 @@ if [ ! -f /app/.env ]; then
 fi
 php artisan migrate --no-interaction --force
 
-echo "Setting folder permissions for uploads:"
-chown -R www-data:www-data bootstrap/cache public/uploads storage/uploads
+echo "Setting folder permissions for www-data:"
+chown -R www-data:bookstack bootstrap/cache public/uploads storage
 
 php artisan cache:clear
 php artisan view:clear