diff --git a/.github/workflows/build_secondary_wheels.yml b/.github/workflows/build_secondary_wheels.yml
index c935d65..9769cb0 100644
--- a/.github/workflows/build_secondary_wheels.yml
+++ b/.github/workflows/build_secondary_wheels.yml
@@ -16,6 +16,7 @@ jobs:
       os ${{ matrix.cbw_os }}, arch ${{ matrix.arch }}
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         py: [310, 39, 38]
         cbw_os: [manylinux_, musllinux_]
@@ -29,18 +30,18 @@ jobs:
         with:
           platforms: all
 
+      - name: Install dependencies
+        uses: astral-sh/setup-uv@v7
+
       - name: Build wheels
         uses: pypa/cibuildwheel@v3.2.1
         env:
+          CIBW_BEFORE_BUILD: curl -LsSf https://astral.sh/uv/install.sh | sh
+          CIBW_XBUILD_TOOLS: uv
           CIBW_BUILD: >
             cp${{ matrix.py }}-${{ matrix.cbw_os }}${{ matrix.arch }}
           CIBW_ARCHS: ${{ matrix.arch }}
-          CIBW_BUILD_FRONTEND: >
-            ${{
-              matrix.cbw_os == 'manylinux_'
-              && 'build[uv]'
-              || 'build'
-            }}
+          CIBW_BUILD_FRONTEND: build[uv]
           CIBW_TEST_REQUIRES: pytest
           CIBW_TEST_COMMAND: > 
             python -X faulthandler {package}/test/debug.py
@@ -99,6 +100,7 @@ jobs:
       os ${{ matrix.cbw_os }}, arch ${{ matrix.arch }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         py: [310, 39, 38]
         os: [
@@ -149,7 +151,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Install dependencies
-        run: pip install uv
+        uses: astral-sh/setup-uv@v7
 
       - name: Build wheels
         uses: pypa/cibuildwheel@v3.2.1
@@ -157,8 +159,7 @@ jobs:
           CIBW_BUILD: >
             cp${{ matrix.py }}-${{ matrix.cbw_os }}${{ matrix.arch }}
           CIBW_ARCHS: ${{ matrix.arch }}
-          CIBW_BUILD_FRONTEND: >
-            ${{ matrix.os == 'macos-latest' && 'build' || 'build[uv]' }}
+          CIBW_BUILD_FRONTEND: build[uv]
           CIBW_TEST_REQUIRES: pytest
           CIBW_TEST_COMMAND: > 
             python -X faulthandler {package}/test/debug.py