diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 2db5d35..e6f130c 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -17,8 +17,6 @@ on:
       - "CMakeLists.txt"
       - "conanfile.py"
       - "pyproject.toml"
-    tags:
-      - "v*.*.*"
 
   pull_request:
     paths:
@@ -250,8 +248,6 @@ jobs:
           CIBW_ENVIRONMENT_PASS_LINUX: >
             CONAN_HOME
             HICTKPY_CONAN_INSTALL_ARGS
-          CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
-          CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28
 
       - name: Verify clean directory
         run: git diff --exit-code
@@ -309,7 +305,6 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: dist
-          path: dist
           merge-multiple: true
 
       - name: Extract dist.tar
diff --git a/pyproject.toml b/pyproject.toml
index 5ded5b9..66d91d7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -68,6 +68,8 @@ optional-dependencies.dev = [
 ]
 
 [tool.scikit-build]
+minimum-version = "0.10"
+build-dir = "build/{wheel_tag}"
 metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
 sdist.include = ["src/_version.py"]
 wheel.expand-macos-universal-tags = true
@@ -107,6 +109,16 @@ testpaths = [
 ]
 
 [tool.cibuildwheel]
+build-frontend = "build"
+manylinux-x86_64-image = "manylinux_2_28"
+manylinux-i686-image = "manylinux_2_28"
+manylinux-aarch64-image = "manylinux_2_28"
+manylinux-ppc64le-image = "manylinux_2_28"
+manylinux-s390x-image = "manylinux_2_28"
+manylinux-pypy_x86_64-image = "manylinux_2_28"
+manylinux-pypy_i686-image = "manylinux_2_28"
+manylinux-pypy_aarch64-image = "manylinux_2_28"
+
 skip = ["cp313*", "cp314*", "*musllinux*", "pp*"]
 test-command = "python -m pytest {project}/test"
 test-extras = ["test", "numpy", "pandas", "pyarrow", "scipy"]
@@ -117,7 +129,13 @@ before-build = [
   "rm -rf '{project}/build'",
 ]
 
-# We are using static linking, thus repairing wheels is not necessary.
+# We are using static linking, thus repairing wheels should not be necessary.
+# Exception being when building portable Linux wheels.
+# See https://github.com/scikit-build/scikit-build-core/pull/698#issuecomment-2082991257
+[tool.cibuildwheel.macos]
+repair-wheel-command = ""
+
+[tool.cibuildwheel.windows]
 repair-wheel-command = ""
 
 [tool.ruff]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 38558ae..b31d20f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,6 +7,7 @@ find_package(
   3.9
   COMPONENTS
     Interpreter
+    Development.Module
     NumPy
   REQUIRED
 )