diff --git a/dnscrypt/proxy/Dockerfile b/dnscrypt/proxy/Dockerfile
index 34e392c..e4c3f79 100644
--- a/dnscrypt/proxy/Dockerfile
+++ b/dnscrypt/proxy/Dockerfile
@@ -43,4 +43,3 @@ CMD dnscrypt-proxy --local-address=$LISTEN_ADDR \
                    --provider-name=$PROVIDER_NAME \
                    --provider-key=$PROVIDER_KEY \
                    --resolver-address=$RESOLVER_ADDR
-
diff --git a/dnscrypt/proxy/arm/Dockerfile b/dnscrypt/proxy/arm/Dockerfile
index 72ccbdb..4fbfadc 100644
--- a/dnscrypt/proxy/arm/Dockerfile
+++ b/dnscrypt/proxy/arm/Dockerfile
@@ -2,7 +2,7 @@
 # Dockerfile for dnscrypt-proxy-arm
 #
 
-FROM resin/rpi-raspbian
+FROM armhf/debian:jessie
 MAINTAINER EasyPi Software Foundation
 
 ENV LIBSODIUM_VERSION 1.0.10
@@ -19,7 +19,7 @@ RUN set -xe \
                           curl \
     && mkdir libsodium \
         && cd libsodium \
-        && curl -sSL https://github.com/vimagick/dockerfiles/raw/master/dnscrypt/proxy/arm/libsodium-$LIBSODIUM_VERSION.tar.gz | tar xz --strip 1 \
+        && curl -sSL https://download.libsodium.org/libsodium/releases/libsodium-$LIBSODIUM_VERSION.tar.gz | tar xz --strip 1 \
         && ./configure --prefix=/usr --enable-minimal \
         && make install \
         && ldconfig \
@@ -27,7 +27,7 @@ RUN set -xe \
         && rm -rf libsodium \
     && mkdir dnscrypt-proxy \
         && cd dnscrypt-proxy \
-        && curl -sSL https://github.com/vimagick/dockerfiles/raw/master/dnscrypt/proxy/arm/dnscrypt-proxy-$DNSCRYPT_VERSION.tar.gz | tar xz --strip 1 \
+        && curl -sSL https://download.dnscrypt.org/dnscrypt-proxy/dnscrypt-proxy-$DNSCRYPT_VERSION.tar.gz | tar xz --strip 1 \
         && ./configure --prefix=/usr --with-plugins \
         && make install \
         && cd .. \
@@ -43,4 +43,3 @@ CMD dnscrypt-proxy --local-address=$LISTEN_ADDR \
                    --provider-name=$PROVIDER_NAME \
                    --provider-key=$PROVIDER_KEY \
                    --resolver-address=$RESOLVER_ADDR
-
diff --git a/dnscrypt/proxy/arm/dnscrypt-proxy-1.6.1.tar.gz b/dnscrypt/proxy/arm/dnscrypt-proxy-1.6.1.tar.gz
deleted file mode 100644
index 323984b..0000000
Binary files a/dnscrypt/proxy/arm/dnscrypt-proxy-1.6.1.tar.gz and /dev/null differ
diff --git a/dnscrypt/proxy/arm/libsodium-1.0.10.tar.gz b/dnscrypt/proxy/arm/libsodium-1.0.10.tar.gz
deleted file mode 100644
index 7326e42..0000000
Binary files a/dnscrypt/proxy/arm/libsodium-1.0.10.tar.gz and /dev/null differ
diff --git a/openvpn/arm/data/dnsmasq.conf b/openvpn/arm/data/dnsmasq.conf
new file mode 100644
index 0000000..5f784ac
--- /dev/null
+++ b/openvpn/arm/data/dnsmasq.conf
@@ -0,0 +1,9 @@
+interface=wlan0
+no-hosts
+no-resolv
+cache-size=10000
+server=8.8.8.8#53
+server=8.8.4.4#53
+dhcp-range=192.168.31.10,192.168.31.20,1h
+dhcp-option=3,192.168.31.1
+dhcp-option=6,192.168.31.1
diff --git a/openvpn/arm/data/pi.ovpn b/openvpn/arm/data/pi.ovpn
new file mode 100644
index 0000000..a8580f1
--- /dev/null
+++ b/openvpn/arm/data/pi.ovpn
@@ -0,0 +1,26 @@
+client
+nobind
+dev tun
+remote-cert-tls server
+remote 127.0.0.1 1194 tcp
+route 1.2.3.4 255.255.255.255 net_gateway
+route 192.168.0.0 255.255.0.0 net_gateway
+
+<key>
+-----PRIVATE KEY-----
+</key>
+
+<cert>
+-----CERTIFICATE-----
+</cert>
+
+<ca>
+-----CERTIFICATE-----
+</ca>
+
+<tls-auth>
+-----OpenVPN Static key V1-----
+</tls-auth>
+
+key-direction 1
+redirect-gateway def1
diff --git a/openvpn/arm/docker-compose.yml b/openvpn/arm/docker-compose.yml
index 00bcaee..890d4ca 100644
--- a/openvpn/arm/docker-compose.yml
+++ b/openvpn/arm/docker-compose.yml
@@ -19,3 +19,12 @@ stunnel:
   extra_hosts:
     - server:1.2.3.4
   restart: always
+
+dnsmasq:
+  image: easypi/dnsmasq-arm
+  volumes:
+    - ./data/dnsmasq.conf:/etc/dnsmasq.d/dnsmasq.conf
+  cap_add:
+    - NET_ADMIN
+  net: host
+  restart: always