diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
deleted file mode 100644
index eec0525..0000000
--- a/.github/workflows/wheels.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Wheels
-
-on: [push, pull_request]
-
-jobs:
-  build_wheels:
-    name: Build wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [windows-2019]
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: cypari_all_wheels
-          path: ./wheelhouse/*.whl
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 0000000..8caff3f
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,55 @@
+name: Windows wheels
+
+on: [push, pull_request]
+
+jobs:
+  build_wheels:
+    name: Build Windows wheels for 64 bit Python
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+  
+    steps:       
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v4
+        name: Install a Python to use for building
+        with:
+          python-version: '3.12'
+          
+      - uses: msys2/setup-msys2@v2
+        name: Setup an msys2 environment
+        with:
+          msystem: UCRT64
+          release: false
+          install: >-
+            base-devel
+            m4
+            bison
+            make
+            patch
+            sed
+          pacboy: gcc:p
+          path-type: inherit
+          
+      - name: Expand the path for Visual Studio 2019
+        run: |
+          echo "/c/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x64" >> $GITHUB_PATH
+
+      - name: Install cibuildwheel
+        run: |
+          python -m pip install cibuildwheel==2.20.0
+          
+      - name: Build gmp and pari
+        run: |
+          bash build_pari.sh pari64 gmp64
+
+      - name: Build many wheels
+        run: |
+          python -m cibuildwheel --output-dir wheelhouse
+
+      - uses: actions/upload-artifact@v4
+        name: Save the wheels as artifacts
+        with:
+          path: ./wheelhouse/*.whl