diff --git a/Dockerfile b/Dockerfile
index c867c5e..c6fdfd1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,11 +30,18 @@ RUN \
   && echo "* Installing Mopidy + Extensions" \
     && pip install -U \
       Mopidy \
-      Mopidy-Iris \
       Mopidy-SoundCloud \
       Mopidy-YouTube \
       Mopidy-Local-Images \
       Mopidy-Local-SQLite \
+  && echo "* Installing Iris" \
+    && pip install -U Mopidy-Iris \
+  && 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 \
+    && chown -R mopidy:mopidy /data \
   && echo "* Ready to start Mopidy" \
   && sleep 10
 
@@ -46,4 +53,4 @@ VOLUME ["/music", "/data"]
 
 LABEL description "Open source media server"
 
-CMD ["/sbin/tini", "--", "mopidy --config '/data/config/mopidy.conf'"]
+CMD ["run.sh"]
diff --git a/run.sh b/run.sh
index 47c427f..99c8bd6 100755
--- a/run.sh
+++ b/run.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
+
 function stop() {
-  kill $PID
+    kill $PID
 }
 
 trap stop HUP INT TERM
-su-exec mopidy mopidy --config "/data/config/mopidy.conf" "${@}" &
+su-exec mopidy mopidy --config "${MOPIDY_CONFIG_FILE}" "${@}" &
 PID=$!
 wait $PID