diff --git a/.travis.yml b/.travis.yml
index 333be39..a94c055 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,9 @@ services:
 
 env:
   matrix:
-    # - ARCH=amd64
-    - ARCH=arm32v7
+    - ARCH=arm IMAGE=hypriot/rpi-node:6.10.0
+    # - ARCH=amd64 IMAGE=amd64/debian:stretch-slim
+
 
 script:
   - ./travis-build.sh
diff --git a/Dockerfile b/Dockerfile
index 4fc8ec7..9bfb97a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
-ARG ARCH=amd64
-FROM resin/rpi-raspbian:stretch
+FROM ${IMAGE}
 
 COPY qemu-arm-static /usr/bin/qemu-arm-static
 
diff --git a/travis-build.sh b/travis-build.sh
index 97b25dc..786741b 100755
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -13,12 +13,12 @@ if [ "$ARCH" != "amd64" ]; then
 
   docker create --name qemu-register hypriot/qemu-register
 
-  if [ "$ARCH" == "arm64v8" ]; then
-    docker cp qemu-register:qemu-aarch64 qemu-aarch64-static
+  if [ "$ARCH" == "arm" ]; then
+    docker cp qemu-register:qemu-arm qemu-arm-static
   fi
 
-  if [ "$ARCH" == "arm32v7" ]; then
-    docker cp qemu-register:qemu-arm qemu-arm-static
+  if [ "$ARCH" == "arm64" ]; then
+    docker cp qemu-register:qemu-aarch64 qemu-aarch64-static
   fi
 
 fi