diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml
index 8f4d237..78e069f 100644
--- a/.github/workflows/nightly.yaml
+++ b/.github/workflows/nightly.yaml
@@ -11,17 +11,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        ios: [^26, ^18, ^17]
         include:
-          - macos: macos-15
-            ios: ^18
+          - ios: ^26
+            xcode: ^26
+          - ios: ^18
+            xcode: ^16
+          - ios: ^17
             xcode: ^16
-          # - macos: macos-15
-          #   ios: ^26
-          #   xcode: ^26
-          # Note: iOS 26 simulator is not yet available on GitHub runners
     uses: ./.github/workflows/reusable-workflow.yaml
     with:
       ios: ${{ matrix.ios }}
       xcode: ${{ matrix.xcode }}
-      macos: ${{ matrix.macos }}
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 2b2dbb9..9b42628 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   permission-check:
-    runs-on: macos-15
+    runs-on: macos-26
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/.github/DangerFiles/Gemfile
     steps:
@@ -33,18 +33,15 @@ jobs:
     needs: [permission-check]
     strategy:
       matrix:
+        ios: [^26, ^18]
         include:
-          - macos: macos-15
-            ios: ^18
+          - ios: ^26
+            xcode: ^26
+          - ios: ^18
             xcode: ^16
-          # - macos: macos-15
-          #   ios: ^26
-          #   xcode: ^26
-          # Note: iOS 26 simulator is not yet available on GitHub runners
     uses: ./.github/workflows/reusable-workflow.yaml
     with:
       is_pr: true
-      macos: ${{ matrix.macos }}
-      ios: ${{ matrix.ios }}
-      xcode: ${{ matrix.xcode }}
+      ios: ${{ matrix.include.ios }}
+      xcode: ${{ matrix.include.xcode }}
     secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/reusable-workflow.yaml b/.github/workflows/reusable-workflow.yaml
index 0d6126e..f14c71f 100644
--- a/.github/workflows/reusable-workflow.yaml
+++ b/.github/workflows/reusable-workflow.yaml
@@ -10,7 +10,7 @@ on:
         required: false
         type: string
       macos:
-        default: macos-15
+        default: macos-26
         required: false
         type: string
       is_pr:
@@ -38,6 +38,9 @@ jobs:
           cd iosTests
           ./prepareios.js
           ./create_test_credentials_from_env.js
+      - name: Install iOS 17 runtime if needed
+        if: ${{ inputs.ios == '^17' }}
+        run: xcodes runtimes install "iOS 17.5"
       - uses: mxcl/xcodebuild@v3
         with:
           xcode: ${{ inputs.xcode }}
@@ -54,7 +57,7 @@ jobs:
           show-code-coverage: false
           upload-bundles: false
           show-passed-tests: false
-        if: success() || failure()
+        if: success() || failure() && ${{ inputs.ios != '^26' }}
       - uses: codecov/codecov-action@v4
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}