diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 2f01314..cdedb3f 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -20,27 +20,38 @@ jobs:
     strategy:
       matrix:
         # Check for latest setpup: https://github.com/pypa/cibuildwheel/blob/main/examples/github-with-qemu.yml
+        # macos-13 is Intel and macos-14 is Apple Silicon
         os: [ubuntu-latest, windows-latest, macos-13, macos-14]
         python: [cp310, cp311, cp312] # As of 3/Oct/24 ortools was not compatible with cp313
-        arch: ["x86_64"]
-        include:
-          # Linux builds (x86_64 and ARM)
+        arch: [x86_64, aarch64, AMD64, arm64]
+        # Use exclude instead of include as it doesn't have the correct behviour (overirdes values)
+        exclude:
+          # Ubuntu include: x86_64, aarch64
+          - os: ubuntu-latest
+            arch: AMD64
           - os: ubuntu-latest
-            arch: "aarch64"
-          # Windows builds (x86_64 only)
-          - os: windows-latest
-            arch: "AMD64"
-          # macOS Intel
+            arch: arm64
+          # Macos-13 include: x86_64
           - os: macos-13
-            arch: "x86_64"
-          # macOS Apple Silicon
-          - os: macos-14
-            arch: "arm64"
-        exclude:
-          - os: windows-latest
-            arch: "x86_64"
-          - os: macos-14
-            arch: "x86_64"
+            arch: aarch64
+          - os: macos-13
+            arch: AMD64
+          - os: macos-13
+            arch: arm64
+          # Macos-14 include: arm64
+          - os: macos-13
+            arch: x86_64
+          - os: macos-13
+            arch: aarch64
+          - os: macos-13
+            arch: AMD64
+          # Windows include: AMD64
+          - os:  windows-2022
+            arch: x86_64
+          - os:  windows-2022
+            arch: aarch64
+          - os:  windows-2022
+            arch: arm64
       fail-fast: false
 
     steps: