diff --git a/app/Dockerfile b/app/Dockerfile
index e4be498..8a3666b 100644
--- a/app/Dockerfile
+++ b/app/Dockerfile
@@ -74,8 +74,12 @@ RUN set -ex \
   && composer install \
   && echo "Changing ownership:" \
   && chown bookstack:bookstack -R . \
+  && echo "Setting folder permissions for www-data:" \
+  && chown www-data:bookstack -R bootstrap/cache public/uploads storage \
   && echo "Ensure www-data got access to Nginx folders:" \
-  && chown www-data:www-data -R /var/lib/nginx /var/log/nginx
+  && chown www-data:www-data -R /var/lib/nginx /var/log/nginx \
+  && echo "Giving all system users access to multirun:" \
+  && chmod 0755 /usr/bin/multirun
 
 USER www-data:www-data
 
diff --git a/app/entrypoint.sh b/app/entrypoint.sh
index 0acaa05..99be78d 100644
--- a/app/entrypoint.sh
+++ b/app/entrypoint.sh
@@ -6,9 +6,6 @@ if [ ! -f /app/.env ]; then
 fi
 php artisan migrate --no-interaction --force
 
-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
 
@@ -27,4 +24,4 @@ trapIt() {
 }
 
 echo "Starting Nginx & PPM:"
-multirun nginx trapIt /ppm/vendor/bin/ppm start --ansi --no-interaction --config=ppm.json
+multirun "nginx" "$( trapIt /ppm/vendor/bin/ppm start --ansi --no-interaction --config=ppm.json )"