diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 38c9f7d6..03954efa 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -2,7 +2,7 @@ name: Create and publish a Docker image
 
 on:
   push:
-    branches: ['main']
+    branches: ['main', 'travis/qemu-speedup']
   release:
     types: ['published']
 
@@ -10,20 +10,34 @@ env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
 
+concurrency:
+  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.ref }}
+
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     permissions:
       contents: read
       packages: write
     strategy:
       fail-fast: false
       matrix:
+        os: [ubuntu-latest, macos-latest-xlarge]
         platform:
           - linux/amd64
           - linux/arm/v6
           - linux/arm/v7
           - linux/arm64
+        exclude:
+          - os: ubuntu-latest
+            platform: linux/arm/v6
+          - os: ubuntu-latest
+            platform: linux/arm/v7
+          - os: ubuntu-latest
+            platform: linux/arm64
+          - os: macos-latest-xlarge
+            platform: linux/amd64
 
     steps:
       - name: Prepare
@@ -31,6 +45,11 @@ jobs:
           platform=${{ matrix.platform }}
           echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
 
+      - name: Setup docker (missing on MacOS)
+        if: runner.os == 'macos'
+        run: |
+          brew install docker
+
       - name: Checkout
         uses: actions/checkout@v4