diff --git a/motion-arm/Dockerfile b/motion-arm/Dockerfile
index e2957d4..def2950 100644
--- a/motion-arm/Dockerfile
+++ b/motion-arm/Dockerfile
@@ -2,21 +2,27 @@
 # Dockerfile for motion-arm
 #
 
-FROM resin/rpi-raspbian
-
+FROM resin/rpi-raspbian:jessie
 MAINTAINER EasyPi Software Foundation
 
+ENV MOTION_VERSION 4.0.1
+ENV MOTION_FILE pi_jessie_motion_${MOTION_VERSION}-1_armhf.deb
+ENV MOTION_URL https://github.com/Motion-Project/motion/releases/download/release-${MOTION_VERSION}/${MOTION_FILE}
+
 RUN set -xe \
     && apt-get update \
-    && apt-get install -y motion \
+    && apt-get install -y curl \
+    && curl -sSL ${MOTION_URL} -o ${MOTION_FILE} \
+    && (dpkg -i ${MOTION_FILE} || apt-get -f install -y) \
     && sed -i -e 's/^daemon on/daemon off/' \
               -e 's/^webcontrol_localhost on/webcontrol_localhost off/' \
               -e 's/^stream_localhost on/stream_localhost off/' \
               /etc/motion/motion.conf \
-    && rm -rf /var/cache/apt/*
+    && rm -rf ${MOTION_FILE} /var/lib/apt/lists/*
 
 VOLUME /var/lib/motion
+WORKDIR /var/lib/motion
 
 EXPOSE 8080 8081
 
-ENTRYPOINT ["/usr/bin/motion"]
+ENTRYPOINT ["motion"]