diff --git a/.github/actions/node-and-build/action.yml b/.github/actions/node-and-build/action.yml
index 73d593ddb5b..ca211e475e8 100644
--- a/.github/actions/node-and-build/action.yml
+++ b/.github/actions/node-and-build/action.yml
@@ -33,9 +33,15 @@ runs:
     # TODO We should be able to skip yarn / bootstrap if we cache enough things. Leaving because skipping causes issues.
     - name: Install
       if: inputs.is-prebuild != 'true' || steps.cache-build-artifacts.outputs.cache-hit != 'true'
-      run: yarn
       shell: bash
       working-directory: ./amplify-js
+      run: |
+        for i in {1..3}; do
+          echo "Starting attempt $i."
+          yarn && break
+          echo "Attempt $i failed."
+          sleep 5
+        done
     - name: Bootstrap
       if: inputs.is-prebuild != 'true' || steps.cache-build-artifacts.outputs.cache-hit != 'true'
       run: yarn bootstrap
diff --git a/.github/workflows/callable-e2e-test-detox.yml b/.github/workflows/callable-e2e-test-detox.yml
index ffea13efb6a..089384f3cf2 100644
--- a/.github/workflows/callable-e2e-test-detox.yml
+++ b/.github/workflows/callable-e2e-test-detox.yml
@@ -31,6 +31,9 @@ jobs:
           path: amplify-js
       - name: Setup node and build the repository
         uses: ./amplify-js/.github/actions/node-and-build
+      - name: Set Xcode version
+        run: |
+          sudo xcode-select -s /Applications/Xcode_16.4.app
       - name: Setup samples staging repository
         uses: ./amplify-js/.github/actions/setup-samples-staging
         with: