diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c4222a16..e6416d528 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -104,20 +104,7 @@ jobs:
             ["buster", "ppc64el", "2024/04/13 14:49:39"],
             ["buster", "s390x", "2024/04/13 14:49:39"]
           ]'
-          pin_qemu='[
-            ["any", "alpha", "deb"],
-            ["any", "hppa", "deb"],
-            ["any", "loong64", "deb"],
-            ["any", "m68k", "deb"],
-            ["any", "mips", "deb"],
-            ["any", "mips64el", "deb"],
-            ["any", "mipsel", "deb"],
-            ["any", "powerpc", "deb"],
-            ["any", "ppc64", "deb"],
-            ["any", "sh4", "deb"],
-            ["any", "sparc", "deb"],
-            ["any", "sparc64", "deb"]
-          ]'
+          pin_qemu='[]'
           include_pkgs='[
             ["sid", "loong64", "gpgv"],
             ["sid", "powerpc", "gpgv"],
@@ -168,7 +155,7 @@ jobs:
                                               tostring)
                             })')"
 
-          case "${{ inputs.wanted || 'active' }}" in
+          case "${{ inputs.wanted || 'all' }}" in
           all) ;;
           active)
             codenames="$(echo "${codenames}" | jq -c -M 'map(select(.active))')"
diff --git a/.github/workflows/per-suite.yml b/.github/workflows/per-suite.yml
index c8221bc0b..33c263f5a 100644
--- a/.github/workflows/per-suite.yml
+++ b/.github/workflows/per-suite.yml
@@ -53,7 +53,6 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      max-parallel: 4
       matrix:
         include: ${{ fromJSON(inputs.architectures) }}
     env:
@@ -65,23 +64,16 @@ jobs:
       SNAPSHOT_DATE: ${{ matrix.timestamp || 'yesterday' }}
       INCLUDE_PKGS: ${{ matrix.pkgs }}
     steps:
-      - name: Set up QEMU (docker/setup-qemu-action)
-        if: matrix.qemu == '' && matrix.arch != 'amd64' && matrix.arch != 'i386'
+      - name: Set up QEMU
+        if: matrix.qemu != '' || matrix.arch != 'amd64' && matrix.arch != 'i386'
         uses: docker/setup-qemu-action@v3
-
-      - name: Set up QEMU (Ubuntu)
-        if: matrix.qemu != '' && matrix.arch != 'amd64' && matrix.arch != 'i386'
-        run: |
-          sudo apt-get update -q
-          sudo apt-get install -yq binfmt-support qemu-user-static
+        with:
+          image: vicamo/binfmt:${{ matrix.qemu || 'latest' }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
-          version: v0.12.0
-
-      - name: Dump QEMU supportness
-        run: ls -al /proc/sys/fs/binfmt_misc
+          version: v0.20.1
 
       - name: Download debuerreotype image tarball
         uses: actions/download-artifact@v4
@@ -169,12 +161,10 @@ jobs:
         with:
           pattern: ${{ env.CODENAME }}-*
 
-      - # Add support for more platforms with QEMU (optional)
-        name: Set up QEMU
-        run: |
-          sudo apt-get update -q
-          sudo apt-get install -yq binfmt-support qemu-user-static
-          ls -al /proc/sys/fs/binfmt_misc
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          image: vicamo/binfmt:${{ matrix.qemu || 'latest' }}
 
       - id: platforms
         run: |