diff --git a/.github/workflows/pr_scan.yml b/.github/workflows/pr_scan.yml
index 7cae0cc7a2..2a421b9b09 100644
--- a/.github/workflows/pr_scan.yml
+++ b/.github/workflows/pr_scan.yml
@@ -7,6 +7,7 @@ on:
 jobs:
   
   build:
+    uses: ./.github/workflows/select-xcode.yml
     env:
       sonarToken: ${{ secrets.SONAR_TOKEN }}
       destination: "name=iPhone 16 Pro,OS=18.1"
@@ -23,10 +24,10 @@ jobs:
       with:
         java-version: '17'
 
-    - name: Select latest Xcode
-      uses: maxim-lobanov/setup-xcode@v1
-      with:
-        xcode-version: '16.1'
+    # - name: Select latest Xcode
+    #   uses: maxim-lobanov/setup-xcode@v1
+    #   with:
+    #     xcode-version: '16.1'
 
     - name: Install Tools
       run: |
diff --git a/.github/workflows/select-xcode.yml b/.github/workflows/select-xcode.yml
new file mode 100644
index 0000000000..757ecf59fe
--- /dev/null
+++ b/.github/workflows/select-xcode.yml
@@ -0,0 +1,13 @@
+name: Base Xcode Setup
+
+on:
+  workflow_call:
+
+jobs:
+  setup-xcode:
+    runs-on: macos-latest
+    steps:
+      - name: Select Xcode 16.1
+        uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '16.1'
\ No newline at end of file