diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6a7d627f0f8..51df93f4db9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,9 +56,9 @@ jobs:
       # workaround for the above, only available for 3.9
       - if: ${{ inputs.os == 'macos-latest' && contains(fromJSON('["3.9"]'), inputs.python-version) && inputs.python-architecture == 'x64' }}
         name: Set up Python ${{ inputs.python-version }}
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
-          python-version: cpython-${{ inputs.python-version }}-macos-x86-64
+          python-version: cpython-${{ inputs.python-version }}-macos-x86_64-none
 
       - name: Install nox
         run: python -m pip install --upgrade pip && pip install nox[uv]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe814d42665..676919fcb8f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -328,15 +328,14 @@ jobs:
 
           # arm64 macOS Python not available on GitHub Actions until 3.10,
           # and 3.7 & 3.8 not available to install from uv, but can backfill 3.9 with x64 from uv
-          # FIXME: setup-uv issue prevents this from working, https://github.com/astral-sh/setup-uv/issues/554
-          # - rust: stable
-          #   python-version: "3.9"
-          #   platform:
-          #     {
-          #       os: "macos-latest",
-          #       python-architecture: "x64",
-          #       rust-target: "x86_64-apple-darwin",
-          #     }
+          - rust: stable
+            python-version: "3.9"
+            platform:
+              {
+                os: "macos-latest",
+                python-architecture: "x64",
+                rust-target: "x86_64-apple-darwin",
+              }
           # arm64 Linux runner is in public preview, so test 3.13 on it
           - rust: stable
             python-version: "3.13"