diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
index 6d583ebd780..71bd7247307 100644
--- a/.github/workflows/spm.yml
+++ b/.github/workflows/spm.yml
@@ -149,3 +149,9 @@ jobs:
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh version-test ${{ matrix.target }} spm
     - name: Analytics Build Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh analytics-import-test ${{ matrix.target }} spm
+    - name: Upload xcodebuild logs
+      if: failure()
+      uses: actions/upload-artifact@v4
+      with:
+        name: xcodebuild-logs-${{ matrix.target }}
+        path: xcodebuild-*.log
diff --git a/scripts/build.sh b/scripts/build.sh
index 2be500a8bbc..35ebd62b958 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -180,7 +180,7 @@ ipad_flags=(
 
 macos_flags=(
   -sdk 'macosx'
-  -destination 'platform=OS X,arch=x86_64'
+  -destination 'platform=OS X,arch=arm64'
 )
 tvos_flags=(
   -sdk "appletvsimulator"
@@ -195,7 +195,7 @@ visionos_flags=(
 )
 catalyst_flags=(
   ARCHS=x86_64 VALID_ARCHS=x86_64 SUPPORTS_MACCATALYST=YES -sdk macosx
-  -destination platform="macOS,variant=Mac Catalyst,arch=x86_64" TARGETED_DEVICE_FAMILY=2
+  -destination platform="macOS,variant=Mac Catalyst,arch=arm64" TARGETED_DEVICE_FAMILY=2
   CODE_SIGN_IDENTITY=- CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
 )