diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
index ac9b28da..e2314b44 100644
--- a/.github/workflows/windows.yaml
+++ b/.github/workflows/windows.yaml
@@ -4,13 +4,14 @@ on:
   push:
     branches:
       - master
+      - ci
   workflow_dispatch:
 
 jobs:
   build:
     runs-on: windows-latest
     env:
-      CONNECTOR_VERSION: "3.2.4"
+      CONNECTOR_VERSION: "3.3.1"
     steps:
 
       - name: Cache Connector
@@ -57,36 +58,19 @@ jobs:
           EOF
           cat site.cfg
 
+      - uses: actions/setup-python@v2
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel==2.7.0
       - name: Build wheels
-        shell: cmd
         working-directory: mysqlclient
-        run: |
-          py -3.10 -m pip install -U setuptools wheel pip
-          py -3.10 setup.py bdist_wheel
-          py -3.9 -m pip install -U setuptools wheel pip
-          py -3.9 setup.py bdist_wheel
-          py -3.8 -m pip install -U setuptools wheel pip
-          py -3.8 setup.py bdist_wheel
-          py -3.7 -m pip install -U setuptools wheel pip
-          py -3.7 setup.py bdist_wheel
+        env:
+          CIBW_PROJECT_REQUIRES_PYTHON: ">=3.8"
+          CIBW_ARCHS: "AMD64"
+          CIBW_TEST_COMMAND: "python -c \"import MySQLdb; print(MySQLdb.version_info)\" "
+        run: "python -m cibuildwheel --prerelease-pythons --output-dir dist"
 
       - name: Upload Wheel
         uses: actions/upload-artifact@v2
         with:
           name: win-wheels
           path: mysqlclient/dist/*.whl
-
-      - name: Check wheels
-        shell: bash
-        working-directory: mysqlclient/dist
-        run: |
-          ls -la
-          py -3.10 -m pip install --no-index --find-links . mysqlclient
-          py -3.10 -c "import MySQLdb; print(MySQLdb.version_info)"
-          py -3.9 -m pip install --no-index --find-links . mysqlclient
-          py -3.9 -c "import MySQLdb; print(MySQLdb.version_info)"
-          py -3.8 -m pip install --no-index --find-links . mysqlclient
-          py -3.8 -c "import MySQLdb; print(MySQLdb.version_info)"
-          py -3.7 -m pip install --no-index --find-links . mysqlclient
-          py -3.7 -c "import MySQLdb; print(MySQLdb.version_info)"
-