diff --git a/data/.gitkeep b/data/db/.gitkeep
similarity index 100%
rename from data/.gitkeep
rename to data/db/.gitkeep
diff --git a/data/logs/.gitkeep b/data/logs/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/data/playlists/.gitkeep b/data/playlists/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/docker-compose.yml b/docker-compose.yml
index cdf841d..8844fe6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,38 +1,35 @@
-version: '2.4'
+version: '3.3'
 services:
-
   mpd:
-    #build:
-    #  context: ./
-    #  dockerfile: alpine.Dockerfile
-    image: tobi312/rpi-mpd:alpine
+    build:
+      context: ./
+      dockerfile: Dockerfile
     container_name: mpd
     restart: unless-stopped
+    devices:
+      - "/dev/snd:/dev/snd"
     ports:
-      - 6600:6600/tcp  # MPD Client
-      - 8000:8000/tcp  # Stream
-    ## PipeWire support
-    #environment:
-      #- XDG_RUNTIME_DIR=/tmp
+      - 6600:6600/tcp
+    environment:
+      - USER_MODE=Y
+      - PUID=1000
+      - PGID=1000
+      - AUDIO_GID=29
+      - ALSA_OUTPUT_CREATE=yes
+      - ALSA_OUTPUT_NAME=
+      - ALSA_OUTPUT_DEVICE=hw:0
+      - ALSA_OUTPUT_MIXER_CONTROL=Digital
+      - ALSA_OUTPUT_MIXER_DEVICE=hw:0
+      - ALSA_OUTPUT_MIXER_TYPE=hardware
     volumes:
-      - /srv/music:/var/lib/mpd/music:ro
-      - /srv/playlists:/var/lib/mpd/playlists:rw
-      - ./data:/var/lib/mpd/data:rw
-      #- ./config/mpd.conf:/etc/mpd.conf:rw
+      - /srv/music:/music:ro
+      #- ./config/lastfm.txt:/user/config/lastfm.txt:ro
+      - ./data/db:/db:rw
+      - ./data/playlists:/playlists:rw
+      - ./data/logs:/log:rw
       # Time:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-      ## PipeWire support by mounting the host socket
-      #- /run/user/1000/pipewire-0:/tmp/pipewire-0
-    devices:
-      - "/dev/snd:/dev/snd"
-    cap_add:
-      - SYS_NICE
-    healthcheck:
-      test: ["CMD-SHELL", "nc -nzv -w 3 127.0.0.1 6600 || exit 1"]
-      interval: 60s
-      timeout: 5s
-      retries: 3
 
   cyp:
     build:
@@ -42,6 +39,9 @@ services:
     restart: unless-stopped
     ports:
       - 8080:8080/tcp
+    environment:
+      - MPD_HOST=192.168.32.209
+      - MPD_PORT=6600
     volumes:
       - ../cyp/_youtube:/cyp/_youtube