diff --git a/Dockerfile b/Dockerfile
index 0afc9e5..b4d1701 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -46,9 +46,6 @@ RUN \
   && echo "* Creating Mopidy User" \
     && addgroup -g ${PGID} mopidy \
     && adduser -h /mopidy -s /bin/sh -D -G mopidy -u ${PUID} mopidy \
-  && echo "* Fixing Privileges" \
-    && mkdir -p /data/{.config,.cache} \
-    && chown -R mopidy:mopidy /data \
   && echo "* Cleaning up" \
     && rm -f /var/cache/apk/* \
   && echo "* Ready to start Mopidy" \
diff --git a/root/usr/local/bin/run.sh b/root/usr/local/bin/run.sh
index b8e0066..e7775f5 100755
--- a/root/usr/local/bin/run.sh
+++ b/root/usr/local/bin/run.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 if [ ! -r /data/.config/mopidy.conf ]; then
-    mkdir -p /data/.config && cp /defaults/mopidy.conf /data/.config
+    mkdir -p /data/.config && cp /defaults/mopidy.conf /data/.config && chown -R mopidy:mopidy /data
 fi
 
 trap "kill $PID" HUP INT TERM