diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index d8f44b10782f181817464e41fff2f72b0fce04f2..b1368492f3fc92ff4bf30180fb104c6c6818f4b7 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -25,8 +25,6 @@ RUN \
 # Runtime stage
 FROM scratch
 COPY --from=rootfs-stage /root-out/ /
-# Add qemu to run on x86_64 systems
-COPY qemu-aarch64-static /usr/bin
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL MAINTAINER="sparkyballs,TheLamer"
 
@@ -101,6 +99,11 @@ RUN \
 	/app \
 	/config \
 	/defaults && \
+ echo "**** add qemu ****" && \
+ curl -o \
+ /usr/bin/qemu-aarch64-static -L \
+	"https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \
+ chmod +x /usr/bin/qemu-aarch64-static && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index c8b3cb4862ccc7842b568a6d4aeb29bfd77b6eff..b5e1de123984a0ce935d9210221daaf0f79aec3c 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -25,8 +25,6 @@ RUN \
 # Runtime stage
 FROM scratch
 COPY --from=rootfs-stage /root-out/ /
-# Add qemu to build on x86_64 systems
-COPY qemu-arm-static /usr/bin
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL MAINTAINER="sparkyballs,TheLamer"
 
@@ -101,6 +99,11 @@ RUN \
 	/app \
 	/config \
 	/defaults && \
+ echo "**** add qemu ****" && \
+ curl -o \
+ /usr/bin/qemu-arm-static -L \
+	"https://lsio-ci.ams3.digitaloceanspaces.com/qemu-arm-static" && \
+ chmod +x /usr/bin/qemu-arm-static && \
  echo "**** cleanup ****" && \
  apt-get clean && \
  rm -rf \