diff --git a/.github/workflows/build-apple.yml b/.github/workflows/build-apple.yml
index 083677e1..504680b6 100644
--- a/.github/workflows/build-apple.yml
+++ b/.github/workflows/build-apple.yml
@@ -15,12 +15,10 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
 
-      # This seems to be related to https://github.com/actions/runner-images/issues/12758
-      # Select appropriate Xcode version from
-      # https://github.com/actions/runner-images/blob/main/images/macos/macos-15-arm64-Readme.md#xcode
       - name: Xcode setup
-        run: |
-          sudo xcode-select --switch /Applications/Xcode_16.4.app
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
 
       - name: Common flutter setup
         uses: ./.github/actions/flutter-common