diff --git a/.zuul.d/debian.yaml b/.zuul.d/debian.yaml
index 23584d46bf..e4f0fe3c49 100644
--- a/.zuul.d/debian.yaml
+++ b/.zuul.d/debian.yaml
@@ -49,8 +49,11 @@
 - job:
     name: kolla-build-debian-aarch64
     parent: kolla-build-debian
-    nodeset: kolla-debian-bookworm-aarch64
+    # NOTE(mnasiadka): Switch to aarch64 nodeset when nodes are fixed
+    nodeset: kolla-debian-bookworm
     voting: false
+    vars:
+      base_arch: aarch64
 
 - job:
     name: kolla-publish-debian-dockerhub
diff --git a/tests/playbooks/pre.yml b/tests/playbooks/pre.yml
index 7e44c87aa8..cee184b0a7 100644
--- a/tests/playbooks/pre.yml
+++ b/tests/playbooks/pre.yml
@@ -201,3 +201,9 @@
           become: true
       when:
         - container_engine == "podman"
+
+    - name: Run multiarch/qemu-user-static image to support cross-arch build
+      command:
+        cmd: "{{ container_engine }} run --rm --privileged multiarch/qemu-user-static --reset -p yes"
+      become: true
+      when: ansible_facts.architecture != (base_arch | default('x86_64'))
diff --git a/tests/playbooks/run.yml b/tests/playbooks/run.yml
index e21c19f217..78ff3ea2e9 100644
--- a/tests/playbooks/run.yml
+++ b/tests/playbooks/run.yml
@@ -10,6 +10,7 @@
         logs_dir: "{{ kolla_build_logs_dir }}"
         quiet: true
         base: "{{ base_distro }}"
+        base_arch: "{{ base_arch | default('x86_64') }}"
         engine: "{{ container_engine }}"
         template_override: /etc/kolla/template_overrides.j2
         # NOTE(yoctozepto): to avoid issues with IPv6 not enabled in the docker daemon