diff --git a/common-gradle-scripts/docker.gradle b/common-gradle-scripts/docker.gradle
index 3d8ba5bd3..dc09a5dd4 100644
--- a/common-gradle-scripts/docker.gradle
+++ b/common-gradle-scripts/docker.gradle
@@ -68,7 +68,7 @@ tasks.register('docker_push', Exec) {
 tasks.register('setup_arch', Exec) {
     group 'docker'
     description 'Setup QEMU for buildx'
-    commandLine 'docker', 'run', '--rm', '--privileged', 'multiarch/qemu-user-static', '--reset', '-p', 'yes'
+    commandLine 'docker', 'run', '--rm', '--privileged', 'tonistiigi/binfmt:latest', '--reset', '-p', 'yes'
 }
 
 tasks.register('setup_buildx', Exec) {