diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 07ae818a..722ebcb8 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -37,13 +37,15 @@ jobs:
     name: Binary wheels
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os:
-          - windows-11-arm  # Windows arm64 wheels
-          - windows-latest  # Windows x86-64 wheels
-          - ubuntu-latest   # All linux wheels (via emulation)
-          - macos-15-intel  # macOS x86-64 wheels
-          - macos-15        # macOS arm64 wheels
+          - windows-11-arm    # Windows arm64 wheels
+          - windows-latest    # Windows x86-64 wheels
+          - ubuntu-24.04      # Linux x86-64 wheels
+          - ubuntu-24.04-arm  # Linux arm64 wheels
+          - macos-15-intel    # macOS x86-64 wheels
+          - macos-15          # macOS arm64 wheels
 
     steps:
       - uses: actions/checkout@v5
diff --git a/pyproject.toml b/pyproject.toml
index 07d2ae79..5ba894fc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -58,7 +58,7 @@ docs = [
 [dependency-groups]
 dist = [
     "build",
-    "cibuildwheel == 3.1.4",
+    "cibuildwheel == 3.3.1",
 ]
 
 [build-system]
@@ -79,7 +79,7 @@ cmake.args = ["-GNinja"]
 build.targets = ["zint_bindings"]
 install.components = ["zint_bindings"]
 
-cmake.version = ">=3.28"
+cmake.version = ">=3.28,<4"
 ninja.version = ">=1.11"
 ninja.make-fallback = false