diff --git a/.github/workflows/build_publish.yml b/.github/workflows/build_publish.yml
index 04340a20..1f20c985 100644
--- a/.github/workflows/build_publish.yml
+++ b/.github/workflows/build_publish.yml
@@ -4,35 +4,84 @@ on: [ push, pull_request ]
 
 jobs:
   build_wheels:
-    name: Build Wheels On ${{ matrix.config.name }}
-    runs-on: ${{ matrix.config.os }}
+    name: Build wheels ${{ matrix.CIBW_BUILD }}
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        config:
-          - {
-            name: "MacOS Latest, Clang",
-            os: macos-latest,
-            test_target: test,
-            cc: "clang", cxx: "clang++"
-          }
-          - {
-            name: "Ubuntu Latest, GCC",
-            os: ubuntu-latest,
-            test_target: test,
-            cc: "gcc", cxx: "g++"
-          }
-#          - {
-#            name: "Windows Latest, MSVC",
-#            os:  v,
-#            test_target: RUN_TESTS,
-#            cc: "cl", cxx: "cl",
-#            environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
-#          }
-            #- {
-            #    name: "Windows Latest, MinGW+gcc",
-          #    os: windows-latest,
-          #    cc: "gcc", cxx: "g++"
-          #  }
+        include:
+#          - CIBW_BUILD: cp36-manylinux_x86_64
+#            os: ubuntu-latest
+#            arch: x86_64
+#            CIBW_PLATFORM: linux
+#          - CIBW_BUILD: cp37-manylinux_x86_64
+#            os: ubuntu-latest
+#            arch: x86_64
+#            CIBW_PLATFORM: linux
+#          - CIBW_BUILD: cp38-manylinux_x86_64
+#            os: ubuntu-latest
+#            arch: x86_64
+#            CIBW_PLATFORM: linux
+#          - CIBW_BUILD: cp39-manylinux_x86_64
+#            os: ubuntu-latest
+#            arch: x86_64
+#            CIBW_PLATFORM: linux
+#
+#          - CIBW_BUILD: cp37-manylinux_aarch64
+#            os: ubuntu-latest
+#            arch: aarch64
+#            CIBW_PLATFORM: linux
+#          - CIBW_BUILD: cp38-manylinux_aarch64
+#            os: ubuntu-latest
+#            arch: aarch64
+#            CIBW_PLATFORM: linux
+#          - CIBW_BUILD: cp39-manylinux_aarch64
+#            os: ubuntu-latest
+#            arch: aarch64
+#            CIBW_PLATFORM: linux
+#
+#          - CIBW_BUILD: cp36-macosx_x86_64
+#            os: macos-latest
+#            arch: x86_64
+#            CIBW_PLATFORM: macos
+#          - CIBW_BUILD: cp37-macosx_x86_64
+#            os: macos-latest
+#            arch: x86_64
+#            CIBW_PLATFORM: macos
+#          - CIBW_BUILD: cp38-macosx_x86_64
+#            os: macos-latest
+#            arch: x86_64
+#            CIBW_PLATFORM: macos
+#          - CIBW_BUILD: cp39-macosx_x86_64
+#            os: macos-latest
+#            arch: x86_64
+#            CIBW_PLATFORM: macos
+#
+#          - CIBW_BUILD: cp38-macosx_arm64
+#            os: macos-latest
+#            arch: arm64
+#            CIBW_PLATFORM: macos
+#          - CIBW_BUILD: cp39-macosx_arm64
+#            os: macos-latest
+#            arch: arm64
+#            CIBW_PLATFORM: macos
+
+          - CIBW_BUILD: cp36-win_amd64
+            os: windows-latest
+            arch: AMD64
+            CIBW_PLATFORM: windows
+          - CIBW_BUILD: cp37-win_amd64
+            os: windows-latest
+            arch: AMD64
+            CIBW_PLATFORM: windows
+#          - CIBW_BUILD: cp38-win_amd64
+#            os: windows-latest
+#            arch: AMD64
+#            CIBW_PLATFORM: windows
+          - CIBW_BUILD: cp39-win_amd64
+            os: windows-latest
+            arch: AMD64
+            CIBW_PLATFORM: windows
 
     steps:
       - uses: actions/checkout@v2
@@ -50,15 +99,18 @@ jobs:
           pip install -e ".[compat,dev]" cibuildwheel twine
       - name: Install Python dependencies
         run: python -m pip install --upgrade pip setuptools wheel numpy tox
-      - name: Configure
+      - name: Build wheels
         run: |
-
           python setup.py bdist_wheel
           cibuildwheel --output-dir dist
           ls dist
         env:
-          CIBW_BUILD: "cp36-* cp37-* cp38-* cp39-*"
-          CIBW_BEFORE_BUILD: "rm -fr python/datasketches.* && rm -fr build/* && pip install cython"
+          CIBW_BUILD: ${{ matrix.CIBW_BUILD }}
+          CIBW_PLATFORM: ${{ matrix.CIBW_PLATFORM }}
+          CIBW_ARCHS: ${{matrix.arch}}
+          CIBW_BEFORE_BUILD: "pip install cython cmake delvewheel"
+          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel show {wheel} && delvewheel repair -w {dest_dir} {wheel}"
+
       - uses: actions/upload-artifact@v2
         with:
           path: ./dist/*.whl