diff --git a/.travis.yml b/.travis.yml
index e3e442a1e..0ea8b3785 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ env:
   - QEMU_ARCH=arm ARCH=armhf
   - QEMU_ARCH=aarch64 ARCH=arm64
 script:
+- if [ "$ARCH" != "amd64" ]; then curl -L -o qemu-$ARCH-static https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-$QEMU_ARCH-static; chmod u+x qemu-$QEMU_ARCH-static; fi
 - docker run --rm --privileged multiarch/qemu-user-static:register
 - docker build -t $REPO:$COMMIT-$ARCH -f Dockerfile.$ARCH .
 after_success:
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index b721761f7..a1ce39cb6 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -4,7 +4,7 @@ FROM lsiobase/alpine.python.arm64:3.7
 ENV PYTHONIOENCODING="UTF-8"
 ENV QEMU_VERSION v2.11.0
 
-ADD https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-arm-static /usr/bin
+ADD qemu-aarch64-static /usr/bin
 
 VOLUME /tv
 
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 6cc8b66f2..8aa5bc016 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -2,9 +2,8 @@ FROM lsiobase/alpine.python.armhf:3.7
 
 # set python to use utf-8 rather than ascii.
 ENV PYTHONIOENCODING="UTF-8"
-ENV QEMU_VERSION v2.11.0
 
-ADD https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-arm-static /usr/bin
+ADD qemu-arm-static /usr/bin
 
 VOLUME /tv