diff --git a/docker-compose-armhf.yml b/docker-compose-armhf.yml
index 8580b7f45..fb4583750 100644
--- a/docker-compose-armhf.yml
+++ b/docker-compose-armhf.yml
@@ -5,6 +5,7 @@ services:
   build: 
      context: .
      dockerfile: Dockerfile.armhf
+  image: haugene/rpi-transmission-openvpn
   privileged: true
   restart: always
   ports:
@@ -19,11 +20,14 @@ services:
     - OPENVPN_PROVIDER=PIA
     - OPENVPN_USERNAME=username
     - OPENVPN_PASSWORD=password
-    - OPENVPN_OPTS="--inactive 3600 --ping 10 --ping-exit 60"
+    - OPENVPN_OPTS=--inactive 3600 --ping 10 --ping-exit 60
     - LOCAL_NETWORK=192.168.0.0/24
 
  proxy:
-  build: ./proxy/Dockerfile.armhf
+  build:
+     context: ./proxy
+     dockerfile: Dockerfile.armhf
+  image: haugene/rpi-transmission-openvpn-proxy
   links:
     - transmission
   ports: