diff --git a/cmus/Dockerfile b/cmus/Dockerfile
index 46c154a..9bc7845 100644
--- a/cmus/Dockerfile
+++ b/cmus/Dockerfile
@@ -2,21 +2,16 @@
 # Dockerfile for cmus
 #
 
-FROM alpine
+FROM alpine:3
 MAINTAINER EasyPi Software Foundation
 
 RUN apk add --no-cache cmus
 
-VOLUME /etc/cmus
-WORKDIR /etc/cmus
+VOLUME /root/.config/cmus
 
-ENV CMUS_HOME=/etc/cmus
+ENV CMUS_HOME=/root/.config/cmus
 ENV CMUS_SOCKET=0.0.0.0:3000
-ENV USERNAME=root
-ENV PASSWORD=secret
 
 EXPOSE 3000
 
-CMD set -xe \
-    && echo "set passwd=$PASSWORD" > rc \
-    && cmus
+ENTRYPOINT cmus
diff --git a/cmus/README.md b/cmus/README.md
index e59c48b..f646b0d 100644
--- a/cmus/README.md
+++ b/cmus/README.md
@@ -4,24 +4,6 @@ cmus
 [cmus][1] is a small, fast and powerful console music player for Unix-like operating systems.
 
 
-## docker-compose.yml
-
-```yaml
-cmus:
-  image: vimagick/cmus
-  ports:
-    - "3000:3000"
-  volumes:
-    - ./data:/etc/cmus
-    - ~/music:/root/music
-  devices:
-    - /dev/snd
-  environment:
-    - PASSWORD=secret
-  tty: yes
-  restart: unless-stopped
-```
-
 ## up and running
 
 ```bash
diff --git a/cmus/arm/Dockerfile b/cmus/arm/Dockerfile
deleted file mode 100644
index 06441e2..0000000
--- a/cmus/arm/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Dockerfile for cmus-arm
-#
-
-FROM easypi/alpine-arm
-MAINTAINER EasyPi Software Foundation
-
-RUN apk add --no-cache cmus
-
-VOLUME /etc/cmus
-WORKDIR /etc/cmus
-
-ENV CMUS_HOME=/etc/cmus
-ENV CMUS_SOCKET=0.0.0.0:3000
-ENV USERNAME=root
-ENV PASSWORD=secret
-
-EXPOSE 3000
-
-CMD set -xe \
-    && echo "set passwd=$PASSWORD" > rc \
-    && cmus
diff --git a/cmus/arm/docker-compose.yml b/cmus/arm/docker-compose.yml
deleted file mode 100644
index 7da34f6..0000000
--- a/cmus/arm/docker-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-cmus:
-  image: easypi/cmus-arm
-  ports:
-    - "3000:3000"
-  volumes:
-    - ./data:/etc/cmus
-    - ~/music:/root/music
-  devices:
-    - /dev/snd
-  environment:
-    - PASSWORD=secret
-  tty: yes
-  restart: unless-stopped
diff --git a/cmus/data/etc/rc b/cmus/data/etc/rc
new file mode 100644
index 0000000..d4baa57
--- /dev/null
+++ b/cmus/data/etc/rc
@@ -0,0 +1 @@
+set passwd=secret
diff --git a/cmus/data/var/.gitkeep b/cmus/data/var/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/cmus/docker-compose.yml b/cmus/docker-compose.yml
index 80bf5e0..ff4b985 100644
--- a/cmus/docker-compose.yml
+++ b/cmus/docker-compose.yml
@@ -1,13 +1,12 @@
-cmus:
-  image: vimagick/cmus
-  ports:
-    - "3000:3000"
-  volumes:
-    - ./data:/etc/cmus
-    - ~/music:/root/music
-  devices:
-    - /dev/snd
-  environment:
-    - PASSWORD=secret
-  tty: yes
-  restart: unless-stopped
+services:
+  cmus:
+    image: easypi/cmus
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./data/etc:/root/.config/cmus
+      - ./data/var:/root/music
+    devices:
+      - /dev/snd
+    tty: yes
+    restart: unless-stopped