diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95245097..c51ee237 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ docker-build-dev:
       mkdir -p ~/.docker/cli-plugins
       mv docker-buildx ~/.docker/cli-plugins/docker-buildx
       docker version
-    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    - docker run --rm --privileged "multiarch/qemu-user-static:$([ $(uname -p) = 'aarch64' ] && echo arm || echo latest)" --reset -p yes
     - echo $CI_BUILD_TOKEN | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
   script:
     - |
@@ -71,7 +71,7 @@ docker-build-prod:
       mkdir -p ~/.docker/cli-plugins
       mv docker-buildx ~/.docker/cli-plugins/docker-buildx
       docker version
-    - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+    - docker run --rm --privileged "multiarch/qemu-user-static:$([ $(uname -p) = 'aarch64' ] && echo arm || echo latest)" --reset -p yes
     - echo $CI_BUILD_TOKEN | docker login -u "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY
   script:
     - |