diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
index e23f4703bfd..eb0dba8c438 100644
--- a/.github/workflows/spm.yml
+++ b/.github/workflows/spm.yml
@@ -85,6 +85,12 @@ jobs:
         max_attempts: 3
         retry_wait_seconds: 120
         command: scripts/build.sh Firebase-Package iOS ${{ matrix.test }}
+    - uses: actions/upload-artifact@v4
+      if: ${{ failure() }}
+      with:
+        name: spm-build-run-${{ matrix.os }}-${{ matrix.xcode }}-logs
+        path: xcodebuild-*.log
+        if-no-files-found: error
 
   # Test iOS Device build since some Firestore dependencies build different files.
   iOS-Device:
@@ -116,8 +122,9 @@ jobs:
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
-        name: spm-ios-device-${{ matrix.os }}-${{ matrix.xcode }}-xcodebuild-build.log
-        path: xcodebuild-build.log
+        name: spm-ios-device-${{ matrix.os }}-${{ matrix.xcode }}-logs
+        path: xcodebuild-*.log
+        if-no-files-found: error
 
   platforms:
     # Don't run on private repo unless it is a PR.
@@ -158,4 +165,5 @@ jobs:
       with:
         name: spm-platforms-${{ matrix.target }}-${{ matrix.os }}-${{ matrix.xcode }}-logs
         path: xcodebuild-*.log
+        if-no-files-found: error