diff --git a/Dockerfile b/Dockerfile
index fee2ef9b5bcef09682df3dbc33a3f6a985c2c4c9..fdf90437264e13282f8313fa31d3d6a975401611 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ COPY resources/shell-tools/ /shell-tools
 
 RUN true\
    && dnf -y upgrade \
-   && dnf -y install podman buildah findutils git \
+   && dnf -y install podman buildah qemu-user-static findutils git \
    && dnf clean all \
    && sed -e 's/.* cgroup_manager =.*/cgroup_manager = "cgroupfs"/' /usr/share/containers/containers.conf > /etc/containers/containers.conf \
    && /shell-tools/install.sh \
diff --git a/gitlab-ci-template.yml b/gitlab-ci-template.yml
index 5d5231fe8baa2084b30f81d0f9cb15afc2e22d01..6dad8c163371ffcba0aa0db9d56a8b2e78b54557 100644
--- a/gitlab-ci-template.yml
+++ b/gitlab-ci-template.yml
@@ -26,6 +26,7 @@ variables:
       --label "org.opencontainers.image.revision=$CI_COMMIT_SHA"
       --label "org.opencontainers.image.created=$(date --rfc-3339 ns)"
       --label "org.opencontainers.image.title=$CI_PROJECT_TITLE"
+      --arch $CI_REGISTRY_IMAGE_ARCH
       $CI_REGISTRY_BUILD_ARGS
       -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-$CI_REGISTRY_IMAGE_ARCH"
       --format docker
@@ -54,7 +55,7 @@ container-build-arm64:
 container-build-aarch64:
   extends: .container-build
   variables:
-    CI_REGISTRY_IMAGE_ARCH: aarch64
+    CI_REGISTRY_IMAGE_ARCH: arm64
   tags:
     - aaarch64
   rules: