diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index baeea9e..503df05 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,8 @@ build-amd64:
   stage: build
   script:
     - wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-x86_64-static -O qemu-x86_64-static
-    - chmod 554 qemu-x86_64-static
+    - chmod 554 qemu-*-static
+    - docker run --rm --privileged multiarch/qemu-user-static:register --reset
     - docker build --build-arg ARCH=amd64 -t ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-amd64 .
     - docker push ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-amd64
 
@@ -26,7 +27,8 @@ build-arm32v6:
   stage: build
   script:
     - wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-arm-static -O qemu-arm-static
-    - chmod 554 qemu-arm-static
+    - chmod 554 qemu-*-static
+    - docker run --rm --privileged multiarch/qemu-user-static:register --reset
     - docker build --build-arg ARCH=arm32v6 -t ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm32v6 .
     - docker push ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm32v6
 
@@ -34,15 +36,17 @@ build-arm32v7:
   stage: build
   script:
     - wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-arm-static -O qemu-arm-static
-    - chmod 554 qemu-arm-static
+    - chmod 554 qemu-*-static
+    - docker run --rm --privileged multiarch/qemu-user-static:register --reset
     - docker build --build-arg ARCH=arm32v7 -t ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm32v7 .
     - docker push ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm32v7
 
 build-arm64v8:
   stage: build
   script:
-    - wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-arm-static -O qemu-arm-static
-    - chmod 554 qemu-arm-static
+    - wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-aarch64-static -O qemu-aarch64-static
+    - chmod 554 qemu-*-static
+    - docker run --rm --privileged multiarch/qemu-user-static:register --reset
     - docker build --build-arg ARCH=arm64v8 -t ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm64v8 .
     - docker push ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm64v8