diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml
index 5e14a738f..5c07f5d37 100644
--- a/.github/workflows/analytics.yml
+++ b/.github/workflows/analytics.yml
@@ -32,15 +32,13 @@ jobs:
     runs-on: macOS-15
     strategy:
       matrix:
-        os: [iOS, catalyst, tvOS, macOS]
+        os: [iOS, tvOS, macOS]
         xcode: ["16.1"]
         include:
           - os: iOS
             device: iPhone 16
+            scheme: AnalyticsExample
             test: true
-          - os: catalyst
-            device: localhost
-            test: false # disabled due to a permissions error on launch (OSStatus -54).
           - os: tvOS
             device: Apple TV 4K (3rd generation) (at 1080p)
             scheme: AnalyticsExampleTV
@@ -50,10 +48,13 @@ jobs:
             scheme: AnalyticsExampleMac
             test: true
     env:
+      OS: ${{ matrix.os }}
+      SETUP: analytics
       SPM: true
       LEGACY: false
-      OS: ${{ matrix.os }}
+      DIR: analytics
       DEVICE: ${{ matrix.device }}
+      TEST: ${{ matrix.test }}
       SCHEME: ${{ matrix.scheme }}
       DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
     steps:
@@ -61,10 +62,8 @@ jobs:
         uses: actions/checkout@master
       - name: Setup
         run: |
-          cd analytics
-          ../scripts/install_prereqs/analytics.sh
-      - name: Build Swift
+          gem install xcpretty
+          cd $SETUP
+          ../scripts/install_prereqs/${SETUP}.sh
+      - name: Build and Test SwiftUI (${{ matrix.os }})
         run: ./scripts/test.sh
-        env:
-          TEST: ${{ matrix.test }}
-          SWIFT_SUFFIX: ""
diff --git a/.github/workflows/authentication.yml b/.github/workflows/authentication.yml
index 1d18f548a..049d4a516 100644
--- a/.github/workflows/authentication.yml
+++ b/.github/workflows/authentication.yml
@@ -31,19 +31,22 @@ jobs:
     name: spm
     runs-on: macOS-15
     env:
+      OS: iOS
+      SETUP: authentication
       SPM: true
       LEGACY: false
-      OS: iOS
+      DIR: authentication
       DEVICE: iPhone 16
       TEST: true
+      SCHEME: AuthenticationExample
+      DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer
     steps:
       - name: Checkout
         uses: actions/checkout@master
       - name: Setup
         run: |
-          cd authentication
-          ../scripts/install_prereqs/authentication.sh
-      - name: Build Swift
+          gem install xcpretty
+          cd $SETUP
+          ../scripts/install_prereqs/${SETUP}.sh
+      - name: Build and Test SwiftUI (${OS})
         run: ./scripts/test.sh
-        env:
-          SWIFT_SUFFIX: ""
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index f14ee86d5..d131d42aa 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -28,10 +28,10 @@ env:
 
 jobs:
   cocoapods:
-    name: cocoapods
+    name: spm
     runs-on: macOS-15
     env:
-      SPM: false
+      SPM: true
       LEGACY: false
       SWIFT_SUFFIX: ""
       TEST: true
@@ -41,10 +41,6 @@ jobs:
       - name: Setup
         run: |
           cd config
-          gem install bundler
-          bundle install
-          gem install xcpretty
-          bundle exec pod install --repo-update
           ../scripts/install_prereqs/config.sh
           xcrun simctl boot "iPhone 16"
       - name: Build Swift