diff --git a/fteproxy/arm/Dockerfile b/fteproxy/arm/Dockerfile
new file mode 100644
index 0000000..669a1e3
--- /dev/null
+++ b/fteproxy/arm/Dockerfile
@@ -0,0 +1,44 @@
+#
+# Dockerfile for fteproxy-arm
+#
+
+FROM easypi/alpine-arm
+MAINTAINER EasyPi Software Foundation
+
+RUN set -xe \
+    && apk add -U build-base \
+                  gmp \
+                  gmp-dev \
+                  libstdc++ \
+                  python \
+                  python-dev \
+                  py-pip \
+    && pip install fteproxy \
+    && apk del build-base \
+               gmp-dev \
+               python-dev \
+    && rm -rf /root/.cache /var/cache/apk/*
+
+ENV MODE server
+ENV UPSTREAM_FORMAT manual-http-request
+ENV DOWNSTREAM_FORMAT manual-http-response
+ENV CLIENT_IP 127.0.0.1
+ENV CLIENT_PORT 8079
+ENV SERVER_IP 127.0.0.1
+ENV SERVER_PORT 8080
+ENV PROXY_IP 127.0.0.1
+ENV PROXY_PORT 8081
+ENV RELEASE 20131224
+ENV KEY FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000
+
+CMD fteproxy --mode $MODE \
+             --upstream-format $UPSTREAM_FORMAT \
+             --downstream-format $DOWNSTREAM_FORMAT \
+             --client_ip $CLIENT_IP \
+             --client_port $CLIENT_PORT \
+             --server_ip $SERVER_IP \
+             --server_port $SERVER_PORT \
+             --proxy_ip $PROXY_IP \
+             --proxy_port $PROXY_PORT \
+             --release $RELEASE \
+             --key $KEY
diff --git a/fteproxy/arm/docker-compose.yml b/fteproxy/arm/docker-compose.yml
new file mode 100644
index 0000000..0856b07
--- /dev/null
+++ b/fteproxy/arm/docker-compose.yml
@@ -0,0 +1,12 @@
+fteproxy:
+  image: easypi/fteproxy-arm
+  ports:
+    - "1194:1194"
+  environment:
+    - MODE=client
+    - SERVER_IP=vpn.easypi.info
+    - SERVER_PORT=4911
+    - CLIENT_IP=0.0.0.0
+    - CLIENT_PORT=1194
+    - KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741
+  restart: always
diff --git a/openvpn/docker-compose.yml b/openvpn/docker-compose.yml
index 6b8c57e..68fcdea 100644
--- a/openvpn/docker-compose.yml
+++ b/openvpn/docker-compose.yml
@@ -20,14 +20,14 @@ fteproxy:
   ports:
     - "4911:4911"
   links:
-    - "server"
+    - server
   environment:
-    - "MODE=server"
-    - "SERVER_IP=0.0.0.0"
-    - "SERVER_PORT=4911"
-    - "PROXY_IP=server"
-    - "PROXY_PORT=1194"
-    - "KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741"
+    - MODE=server
+    - SERVER_IP=0.0.0.0
+    - SERVER_PORT=4911
+    - PROXY_IP=server
+    - PROXY_PORT=1194
+    - KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741
   restart: always
 
 ################################### CLIENT ###################################
@@ -37,12 +37,12 @@ fteproxy:
 #  ports:
 #    - "1194:1194"
 #  environment:
-#    - "MODE=client"
-#    - "SERVER_IP=vpn.easypi.info"
-#    - "SERVER_PORT=4911"
-#    - "CLIENT_IP=0.0.0.0"
-#    - "CLIENT_PORT=1194"
-#    - "KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741"
+#    - MODE=client
+#    - SERVER_IP=vpn.easypi.info
+#    - SERVER_PORT=4911
+#    - CLIENT_IP=0.0.0.0
+#    - CLIENT_PORT=1194
+#    - KEY=66754b8113ea7a218b7613f73f7e13b1e91790216f659b5f78b903b34c654741
 #  restart: always
 #
 ##############################################################################