diff --git a/docker/init/01-user-setup.sh b/docker/init/01-user-setup.sh
index 9b2755d1..5be17671 100644
--- a/docker/init/01-user-setup.sh
+++ b/docker/init/01-user-setup.sh
@@ -18,4 +18,5 @@ else
     fi
 fi
 
-usermod -aG www-data $POSTGRES_USER
+# Run nginx as specified user
+sed -i 's/user www-data;/user dispatch;/g' /etc/nginx/nginx.conf
diff --git a/docker/init/03-init-dispatcharr.sh b/docker/init/03-init-dispatcharr.sh
index 722e916b..5e9e497b 100644
--- a/docker/init/03-init-dispatcharr.sh
+++ b/docker/init/03-init-dispatcharr.sh
@@ -1,19 +1,15 @@
 #!/bin/bash
 
-# Required so both uwsgi and nginx (www-data) can use it
-# @TODO: change nginx to run as the same use as uwsgi
-
 # NOTE: mac doesn't run as root, so only manage permissions
 # if this script is running as root
 if [ "$(id -u)" = "0" ]; then
     touch /app/uwsgi.sock
     chown -R $PUID:$PGID /app
-    chown $PUID:www-data /app/uwsgi.sock
-    chmod 777 /app/uwsgi.sock
+    chown $PUID:$PGID /app/uwsgi.sock
 
-    # Create and set permissions for the cached_m3u directory
-    mkdir -p /app/media/cached_m3u
-    chown -R $PUID:$PGID /app/media/cached_m3u
-    chmod 777 /app/media/cached_m3u
+    # Create and set permissions for the media / cache directories
+    mkdir -p /app/media
+
+    chown -R $PUID:$PGID /app
     echo "Created and set permissions for cached_m3u directory"
 fi