diff --git a/docker/Dockerfile b/docker/Dockerfile
index c500d59..ae1bb6f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,6 +4,7 @@ FROM debian:testing
 # hadolint ignore=DL3008
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
+        arch-test \
         mmdebstrap \
         bubblewrap \
         dosfstools \
@@ -32,8 +33,6 @@ RUN apt-get update && \
         git && \
         rm -rf /var/lib/apt/lists/*
 
-RUN if [ "$(uname -m)" = "x86_64" ]; then apt update && apt install qemu-user-static arch-test -y; fi
-
 COPY files/pip.conf /etc/pip.conf
 RUN pip install omegaconf
 
diff --git a/tools/build-container.sh b/tools/build-container.sh
index 2809fff..034916c 100755
--- a/tools/build-container.sh
+++ b/tools/build-container.sh
@@ -1,3 +1,7 @@
 #!/bin/bash
 
+# qemu-binfmt with non-native chroot
+sudo apt update
+sudo apt install qemu-user-static -y
+
 docker build -t ruck docker