diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml
index 49d26b29a5c..5b7dc6c26cc 100644
--- a/.github/workflows/functions.yml
+++ b/.github/workflows/functions.yml
@@ -30,17 +30,17 @@ jobs:
     strategy:
       matrix:
         target: [ios, tvos, macos, watchos]
-        include:
+        build-env:
           - os: macos-14
             xcode: Xcode_15.2
           - os: macos-15
             xcode: Xcode_16.1
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.build-env.os }}
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
     - name: Xcode
-      run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     # The integration tests are flaky on Xcode 15 so only run the unit tests. The integration tests still run with SPM.
diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
index 6c4f331dbde..220f98b5741 100644
--- a/.github/workflows/storage.yml
+++ b/.github/workflows/storage.yml
@@ -195,15 +195,14 @@ jobs:
     strategy:
       matrix:
         target: [ios, tvos, macos, watchos]
-        os: [macos-14]
-        include:
+        build-env:
           - os: macos-14
             xcode: Xcode_15.3
             tests: --skip-tests
           - os: macos-15
             xcode: Xcode_16.1
             tests: --test-specs=unit
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.build-env.os }}
     steps:
     - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
@@ -212,10 +211,10 @@ jobs:
     - name: Xcodes
       run: ls -l /Applications/Xcode*
     - name: Xcode
-      run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
     - name: Build and test
       run: |
-       scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec ${{ matrix.tests }} \
+       scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec ${{ matrix.build-env.tests }} \
          --platforms=${{ matrix.target }}
 
   storage-cron-only:
@@ -224,13 +223,12 @@ jobs:
     strategy:
       matrix:
         target: [ios, tvos, macos, watchos]
-        os: [macos-14, macos-15]
-        include:
+        build-env:
           - os: macos-14
             xcode: Xcode_15.3
           - os: macos-15
             xcode: Xcode_16.1
-    runs-on: ${{ matrix.os }}
+    runs-on: ${{ matrix.build-env.os }}
     needs: pod-lib-lint
     steps:
     - uses: actions/checkout@v4
@@ -238,6 +236,6 @@ jobs:
     - name: Setup Bundler
       run: scripts/setup_bundler.sh
     - name: Xcode
-      run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
     - name: PodLibLint Storage Cron
       run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec --platforms=${{ matrix.target }} --use-static-frameworks --skip-tests