diff --git a/images/docker/image-factory-runner/Dockerfile b/images/docker/image-factory-runner/Dockerfile
index 4fde4e68..3010a2ea 100644
--- a/images/docker/image-factory-runner/Dockerfile
+++ b/images/docker/image-factory-runner/Dockerfile
@@ -23,6 +23,8 @@ RUN apt-get update -y && \
     libcap2-bin \
     lsb-release \
     podman \
+    qemu \
+    qemu-user-static \
     slirp4netns \
     software-properties-common \
     sudo \
diff --git a/images/docker/image-factory-runner/files/gha b/images/docker/image-factory-runner/files/gha
index 5fc71e03..a0fe1b33 100644
--- a/images/docker/image-factory-runner/files/gha
+++ b/images/docker/image-factory-runner/files/gha
@@ -1,3 +1,5 @@
 gha ALL=(ALL) NOPASSWD: /bin/umount /.pat
 gha ALL=(ALL) NOPASSWD: /bin/rmdir /.pat
+gha ALL=(ALL) NOPASSWD: /usr/sbin/update-binfmts --enable qemu-aarch64
+gha ALL=(ALL) NOPASSWD: /usr/sbin/update-binfmts --enable qemu-arm
 gha ALL=(ALL) NOPASSWD:ALL # TODO: remove this line once development is done
diff --git a/images/docker/image-factory-runner/scripts/start-github-runner.sh b/images/docker/image-factory-runner/scripts/start-github-runner.sh
index 84a9bfb3..bd89efc3 100644
--- a/images/docker/image-factory-runner/scripts/start-github-runner.sh
+++ b/images/docker/image-factory-runner/scripts/start-github-runner.sh
@@ -28,6 +28,10 @@ echo "Deleting PAT token from runner filesystem..."
 sudo umount /.pat
 sudo rmdir /.pat
 
+# QEMU setup
+sudo update-binfmts --enable qemu-aarch64
+sudo update-binfmts --enable qemu-arm
+
 echo "Connect runner to GitHub:"
 cd actions-runner
 ./config.sh \
diff --git a/images/packer/image-factory-vm/scripts/setup-vm.sh b/images/packer/image-factory-vm/scripts/setup-vm.sh
index 0c20a8b5..00d7b5d5 100644
--- a/images/packer/image-factory-vm/scripts/setup-vm.sh
+++ b/images/packer/image-factory-vm/scripts/setup-vm.sh
@@ -24,8 +24,6 @@ apt-get install --no-install-recommends -y \
     libcap2-bin \
     lsb-release \
     podman \
-    qemu \
-    qemu-user-static \
     slirp4netns \
     software-properties-common \
     unzip \