diff --git a/.gitlab/ci/definitions.yml b/.gitlab/ci/definitions.yml
index 9b34ece..97a3a2c 100644
--- a/.gitlab/ci/definitions.yml
+++ b/.gitlab/ci/definitions.yml
@@ -2,6 +2,7 @@
   stage: custom
   needs: []
   script:
+    - ./scripts/register-binfmt
     - ./scripts/lib/custom-docker-build
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
diff --git a/.gitlab/ci/gitlab.images.yml b/.gitlab/ci/gitlab.images.yml
index 98a3da8..5a51f9f 100644
--- a/.gitlab/ci/gitlab.images.yml
+++ b/.gitlab/ci/gitlab.images.yml
@@ -10,6 +10,7 @@ gitlab:
   parallel:
     matrix:
       - DEBIAN: ['bullseye']
+        ARCH: ['arm64', 'amd64']
         RUBY: ['2.7.patched', '3.0.patched']
         GIT: ['2.36']
         POSTGRESQL: ['11', '12', '13']
diff --git a/scripts/register-binfmt b/scripts/register-binfmt
new file mode 100755
index 0000000..29a8c43
--- /dev/null
+++ b/scripts/register-binfmt
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+ls -al /proc/sys/fs/binfmt_misc
+
+echo -1 > /proc/sys/fs/binfmt_misc/qemu-aarch64 || true
+
+apk add -U qemu-aarch64
+
+echo ":qemu-aarch64:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-aarch64:OCF" > /proc/sys/fs/binfmt_misc/register