diff --git a/.github/workflows/dockerarm.yml b/.github/workflows/dockerarm.yml
index 88e3daa..186f548 100644
--- a/.github/workflows/dockerarm.yml
+++ b/.github/workflows/dockerarm.yml
@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
-      - name: register qemu(?)
-        run: docker run --rm --privileged multiarch/qemu-user-static:register
+      - name: Register self-compiled qemu
+        run: docker run --rm --privileged meedamian/simple-qemu-test:minimal --reset -p yes
       - name: Build the Docker image
         run: docker build . --file 0.18/source/Dockerfile --tag bitcoind:arm-$(date +%s)
diff --git a/0.18/source/Dockerfile b/0.18/source/Dockerfile
index 94f5c42..7130578 100644
--- a/0.18/source/Dockerfile
+++ b/0.18/source/Dockerfile
@@ -1,14 +1,6 @@
-FROM alpine:3.10 AS downloader
-
-RUN wget --quiet -O /qemu-arm-static \
-    https://github.com/multiarch/qemu-user-static/releases/download/v4.0.0-2/qemu-arm-static ;\
-    chmod +x /qemu-arm-static
-
 # Build stage for Bitcoin Core
 FROM arm32v7/alpine:3.10 AS bitcoin-core
 
-COPY --from=downloader /qemu-arm-static  /usr/bin/qemu-arm-static
-
 # fetch already built berkeleydb
 COPY --from=lncm/berkeleydb:db-4.8.30.NC-linux-arm /opt /opt
 
@@ -94,8 +86,6 @@ RUN strip ${BITCOIN_PREFIX}/lib/libbitcoinconsensus.so.0.0.0
 # Build stage for compiled artifacts
 FROM arm32v7/alpine:3.10 AS final
 
-COPY --from=downloader /qemu-arm-static  /usr/bin/qemu-arm-static
-
 LABEL maintainer.0="nolim1t (@nolim1t)" \
       maintainer.1="Damian Mee (@meeDamian)"