diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 75beab12..4103f5db 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -37,7 +37,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # for correct image labeling via `git describe --tags`
-      - uses: docker/setup-qemu-action@v3
       - uses: docker/setup-buildx-action@v3
 
       - name: Detect correct Git ref for image build
@@ -96,10 +95,10 @@ jobs:
           - i386
           - ppc64le
           - s390x
-    runs-on: ${{ (matrix.arch == 's390x' && 'macos') || 'ubuntu' }}-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
       - run: make npm.install
         working-directory: docker/coturn/