diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index cf7ec7571..7f7a19528 100644
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -27,7 +27,7 @@ env:
   secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }}
 
 jobs:
-  cocoapods:
+  spm-buildonly:
     name: spm (non-SwiftUI)
     runs-on: macOS-15
     env:
diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml
index 9ab5536d3..2277f71df 100644
--- a/.github/workflows/firestore.yml
+++ b/.github/workflows/firestore.yml
@@ -27,27 +27,24 @@ env:
   secrets_passphrase: ${{ secrets.GHASECRETSGPGPASSPHRASE1 }}
 
 jobs:
-  cocoapods:
+  spm:
     name: cocoapods
     runs-on: macOS-15
     env:
-      SPM: false
+      SPM: true
       LEGACY: false
       OS: iOS
+      DIR: firestore
       DEVICE: iPhone 16
       TEST: false
+      SCHEME: FirestoreExample
     steps:
       - name: Checkout
         uses: actions/checkout@master
       - name: Setup
         run: |
           cd firestore
-          gem install bundler
-          bundle install
           gem install xcpretty
-          bundle exec pod install --repo-update
           ../scripts/install_prereqs/firestore.sh
       - name: Build
         run: ./scripts/test.sh
-        env:
-          SWIFT_SUFFIX: ""