diff --git a/mpd/Dockerfile b/mpd/Dockerfile
index cd1948a..b257ccb 100644
--- a/mpd/Dockerfile
+++ b/mpd/Dockerfile
@@ -12,4 +12,4 @@ RUN set -xe \
 VOLUME /var/lib/mpd
 
 EXPOSE 6600
-CMD ["mpd", "--stdout", "--no-daemon"]
+CMD ["mpd", "--stdout", "--no-daemon", "/etc/mpd/mpd.conf"]
diff --git a/mpd/arm/Dockerfile b/mpd/arm/Dockerfile
deleted file mode 100644
index 9ca68f2..0000000
--- a/mpd/arm/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Dockerfile for mpd-arm
-#
-
-FROM alpine:3
-MAINTAINER EasyPi Software Foundation
-
-RUN set -xe \
-    && apk add --no-cache mpd mpc ncmpc \
-    && setcap -r /usr/bin/mpd
-
-VOLUME /var/lib/mpd
-
-EXPOSE 6600
-CMD ["mpd", "--stdout", "--no-daemon"]
diff --git a/mpd/arm/Dockerfile.debian b/mpd/arm/Dockerfile.debian
deleted file mode 100644
index 8d3870e..0000000
--- a/mpd/arm/Dockerfile.debian
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Dockerfile for mpd-arm
-#
-
-FROM armhf/debian:jessie
-MAINTAINER EasyPi Software Foundation
-
-RUN set -xe \
-    && apt-get update \
-    && apt-get install -y mpd mpc \
-    && rm -rf /var/lib/apt/lists/*
-
-VOLUME /var/lib/mpd
-
-EXPOSE 6600
-CMD ["mpd", "--stdout", "--no-daemon"]
diff --git a/mpd/arm/README.md b/mpd/arm/README.md
deleted file mode 100644
index b8975ce..0000000
--- a/mpd/arm/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Music Player Daemon
-===================
-
-## Raspberry Pi OS
-
-Audio is enabled by default
-
-## ArchLinuxArm
-
-```bash
-$ echo 'snd-bcm2835' > /etc/modules-load.d/raspberrypi.conf
-$ echo 'dtparam=audio=on' >> /boot/config.txt
-$ reboot
-```
diff --git a/mpd/arm/docker-compose.yml b/mpd/arm/docker-compose.yml
deleted file mode 100644
index 59873c9..0000000
--- a/mpd/arm/docker-compose.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: "3.8"
-
-services:
-
-  mpd:
-    image: easypi/mpd-arm
-    ports:
-      - "6600:6600"
-      - "8800:8800"
-    volumes:
-      - ./data/config:/root/.config
-      - ./data/music:/var/lib/mpd/music
-      - ./data/playlists:/var/lib/mpd/playlists
-    devices:
-      - /dev/snd
-#   depends_on:
-#     - icecast
-    restart: unless-stopped
-
-# icecast:
-#   image: vimagick/icecast
-#   ports:
-#     - "8000:8000"
-#   restart: unless-stopped
diff --git a/mpd/data/config/mpd.conf.sample b/mpd/data/config/mpd.conf.sample
new file mode 100644
index 0000000..ae29908
--- /dev/null
+++ b/mpd/data/config/mpd.conf.sample
@@ -0,0 +1,28 @@
+music_directory    "/var/lib/mpd/music"
+playlist_directory "/var/lib/mpd/playlists"
+db_file            "/var/lib/mpd/database"
+log_file           "/var/log/mpd/mpd.log"
+pid_file           "/var/run/mpd.pid"
+state_file         "/var/lib/mpd/state"
+sticker_file       "/var/lib/mpd/sticker.sql"
+
+audio_output {
+  type            "shout"
+  name            "RasPi MPD Stream"
+  description     "MPD stream on Raspberry Pi"
+  host            "x.x.x.x"
+  port            "8000"
+  mount           "/mpd"
+  password        "hackme"
+  bitrate         "128"
+  format          "44100:16:2"
+  encoding        "mp3"
+}
+
+audio_output {
+  type            "alsa"
+  name            "My ALSA Device"
+  device          "hw:CARD=Headphones,DEV=0"
+  mixer_control   "Headphone"
+  mixer_index     "0"
+}
diff --git a/mpd/docker-compose.yml b/mpd/docker-compose.yml
index b3cd8ca..e9e9436 100644
--- a/mpd/docker-compose.yml
+++ b/mpd/docker-compose.yml
@@ -8,7 +8,7 @@ services:
       - "6600:6600"
       - "8800:8800"
     volumes:
-      - ./data/config:/root/.config
+      - ./data/config:/etc/mpd
       - ./data/music:/var/lib/mpd/music
       - ./data/playlists:/var/lib/mpd/playlists
     devices: