diff --git a/mpd/Dockerfile b/mpd/Dockerfile
index f782a49..611e1b2 100644
--- a/mpd/Dockerfile
+++ b/mpd/Dockerfile
@@ -2,10 +2,13 @@
 # Dockerfile for mpd
 #
 
-FROM alpine
-MAINTAINER kev <noreply@easypi.pro>
+FROM alpine:3
+MAINTAINER EasyPi Software Foundation
+
+RUN set -xe \
+    && apk add --no-cache mpd mpc \
+    && setcap -r /usr/bin/mpd
 
-RUN apk add --no-cache mpd mpc
 COPY mpd.conf /etc/mpd.conf
 VOLUME /var/lib/mpd
 
diff --git a/mpd/arm/Dockerfile b/mpd/arm/Dockerfile
index f545d38..b4e6c02 100644
--- a/mpd/arm/Dockerfile
+++ b/mpd/arm/Dockerfile
@@ -5,7 +5,10 @@
 FROM arm32v7/alpine:3
 MAINTAINER EasyPi Software Foundation
 
-RUN apk add --no-cache mpd mpc
+RUN set -xe \
+    && apk add --no-cache mpd mpc \
+    && setcap -r /usr/bin/mpd
+
 COPY mpd.conf /etc/mpd.conf
 VOLUME /var/lib/mpd