diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a7800af..0d00d7b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,9 +38,9 @@ jobs:
             arch: "ppc64le"
           - os: ubuntu-20.04
             arch: "s390x"
-          - os: windows-2016
+          - os: windows-2019
             arch: "AMD64"
-          - os: windows-2016
+          - os: windows-2019
             arch: "x86"
           - os: macos-10.15
             arch: "universal2"
diff --git a/pyproject.toml b/pyproject.toml
index c15bd03..5deaaca 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,9 @@
 [build-system]
-requires = ["setuptools>=42", "wheel", "scikit-build"]
+requires = [
+    "setuptools>=42",
+    "wheel",
+    "scikit-build>=0.12",
+]
 build-backend = "setuptools.build_meta"
 
 [tool.cibuildwheel]
@@ -19,7 +23,6 @@ manylinux-i686-image = "manylinux1"
 
 [tool.cibuildwheel.macos.environment]
 MACOSX_DEPLOYMENT_TARGET = "10.9"
-CMAKE_OSX_ARCHITECTURES = "arm64;x86_64"
 
 [tool.cibuildwheel.windows]
 before-all = [
diff --git a/scripts/repair_wheel.py b/scripts/repair_wheel.py
index 3513660..009a5c5 100644
--- a/scripts/repair_wheel.py
+++ b/scripts/repair_wheel.py
@@ -59,8 +59,8 @@ def main():
         additional_platforms = []
         if os_ == "macos":
             # first, get the target macOS deployment target from the wheel
-            match = re.match(r"^.*-macosx_(\d+)_(\d+)_x86_64\.whl$", file.name)
-            assert match is not None
+            match = re.match(r"^.*-macosx_(\d+)_(\d+)_.*\.whl$", file.name)
+            assert match is not None, f"Couldn't match on {file.name}"
             target = tuple(map(int, match.groups()))
 
             # let's add universal2 platform for this wheel.