diff --git a/docker/config/docker.mpd.conf b/docker/config/docker.mpd.conf
index 4ec64890e..f3c45668c 100644
--- a/docker/config/docker.mpd.conf
+++ b/docker/config/docker.mpd.conf
@@ -11,7 +11,7 @@
 # be disabled and audio files will only be accepted over ipc socket (using
 # file:// protocol) or streaming files over an accepted protocol.
 #
-music_directory		        "/home/pi/RPi-Jukebox-RFID/shared/audiofolders"
+music_directory		        "~/RPi-Jukebox-RFID/shared/audiofolders"
 #
 # This setting sets the MPD internal playlist directory. The purpose of this
 # directory is storage for playlists created by MPD. The server will use
diff --git a/docker/docker-compose.linux.yml b/docker/docker-compose.linux.yml
index 9609dc18d..5f717ba28 100755
--- a/docker/docker-compose.linux.yml
+++ b/docker/docker-compose.linux.yml
@@ -2,28 +2,15 @@ version: "3.9"
 
 services:
   mpd:
-    build:
-      args:
-        - UID=${UID:-1000}
-        - USER=pi
-        - HOME=/home/pi
     environment:
       - PULSE_SERVER=unix:/tmp/pulse-sock
     volumes:
-      - ../shared/audiofolders:/home/pi/RPi-Jukebox-RFID/shared/audiofolders
-      - ../shared/playlists:/home/pi/.config/mpd/playlists
-      - ./config/docker.pulse.mpd.conf:/home/pi/.config/mpd/mpd.conf
+      - ./config/docker.pulse.mpd.conf:/root/.config/mpd/mpd.conf
       - $XDG_RUNTIME_DIR/pulse/native:/tmp/pulse-sock
 
   jukebox:
-    build:
-      args:
-        - UID=${UID:-1000}
-        - USER=pi
-        - HOME=/home/pi
     environment:
       - PULSE_SERVER=unix:/tmp/pulse-sock
     volumes:
-      - ../shared:/home/pi/RPi-Jukebox-RFID/shared
-      - ./config/docker.pulse.mpd.conf:/home/pi/.config/mpd/mpd.conf
+      - ./config/docker.pulse.mpd.conf:/root/.config/mpd/mpd.conf
       - $XDG_RUNTIME_DIR/pulse/native:/tmp/pulse-sock
diff --git a/docker/jukebox.Dockerfile b/docker/jukebox.Dockerfile
index 0936f5d46..bc20feec5 100644
--- a/docker/jukebox.Dockerfile
+++ b/docker/jukebox.Dockerfile
@@ -49,8 +49,7 @@ RUN [ "$(uname -m)" = "aarch64" ] && ARCH="arm64" || ARCH="$(uname -m)"; \
     tar -xzf libzmq.tar.gz -C ${ZMQ_PREFIX}; \
     rm -f libzmq.tar.gz;
 
-RUN export ZMQ_PREFIX=${PREFIX} && export ZMQ_DRAFT_API=1
-RUN pip install -v --no-binary pyzmq pyzmq
+RUN export ZMQ_PREFIX=${ZMQ_PREFIX} && export ZMQ_DRAFT_API=1 && pip install pyzmq pyzmq
 
 EXPOSE 5555 5556