diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e6465de..284b0de 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -461,18 +461,20 @@ jobs:
         with:
           submodules: true
 
-      - name: Set Additional Envs
-        run: |
-          echo "PYTHON_SUBVERSION=$(echo $PYTHON_VERSION | cut -c 3-)" >> $GITHUB_ENV
+      - name: Set up QEMU
+        if: runner.os == 'Linux'
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
 
       - name: Compile with cibuildwheel
         uses: pypa/cibuildwheel@v2.17.0
         env:
           CIBW_PLATFORM: "${{ matrix.runner.cibuildwheel}}"
-          CIBW_BUILD: "cp3${{env.PYTHON_SUBVERSION}}-*"  # see https://github.com/cvxpy/cvxpy/blob/master/.github/workflows/build.yml
-          CIBW_ARCHS_LINUX: aarch64 i686  # arm64 and 32 bits
+          CIBW_BUILD: "${{ env.python.name}}-*"  # see https://github.com/cvxpy/cvxpy/blob/master/.github/workflows/build.yml
+          CIBW_ARCHS_LINUX: aarch64 # arm64 and 32 bits
           CIBW_ARCHS_MACOS: arm64  
-          CIBW_ARCHS_WINDOWS: x86  # 32 bits
+          CIBW_ARCHS_WINDOWS: arm64 # 32 bits and arm64
           CIBW_ENVIRONMENT: __O3_OPTIM=1
           CIBW_BEFORE_ALL: python -m pip install --upgrade setuptools wheel pybind11 pip
           CIBW_BEFORE_BUILD_MACOS: make clean && make CC=clang CXX=clang++
@@ -486,7 +488,7 @@ jobs:
             cmake --build . --config Release &&
             cmake --install . --prefix ..\built
           CIBW_TEST_REQUIRES: grid2op pandapower
-          CIBW_TEST_SKIP: "cp312-* *-macosx_arm64"  # to silence warning "While arm64 wheels can be built on x86_64, they cannot be tested."
+          CIBW_TEST_SKIP: "cp312-* *-macosx_arm64" "*-win_arm64" # to silence warning "While arm64 wheels can be built on x86_64, they cannot be tested."
           CIBW_TEST_COMMAND: >
             python -c "import lightsim2grid" &&
             python -c "from lightsim2grid import *" &&
@@ -505,7 +507,7 @@ jobs:
     name: Package wheels
     runs-on: ubuntu-latest
     # needs: [manylinux_build, windows_build, macos_build_37_]
-    needs: [exotic_build, macos_build_37_]
+    needs: [exotic_build, macos_build_37_, windows_build, manylinux_build]
 
     steps:
       - name: Download wheels