diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index edc1db4126..b888c3f528 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ concurrency:
 
 env:
   # Path format pulled from https://github.com/actions/runner-images/blob/main/images/macos/macos-15-Readme.md#xcode
-  DEVELOPER_DIR: /Applications/Xcode_16.4.app
+  DEVELOPER_DIR: /Applications/Xcode_26.0.app
 
 jobs:
   build_and_test:
@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         # Add additional Xcode versions here if necessary.
-        xcode: ["Xcode_16.4"]
+        xcode: ["Xcode_26.0", "Xcode_16.4"]
 
     steps:
       - name: Set Xcode version
@@ -41,9 +41,15 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Check Xcode version
+        if: ${{ matrix.xcode != 'Xcode_16.4' }}
         run: |
           Scripts/check_xcode_version.py
 
+      - name: Download Metal toolchain
+        if: ${{ matrix.xcode == 'Xcode_26.0' }}
+        run: |
+          xcodebuild -downloadComponent MetalToolchain
+
       - uses: ./.github/actions/clone-everything
         with:
           access-token: ${{ secrets.ACCESS_TOKEN }}
diff --git a/.xcode-version b/.xcode-version
index 4a68a99fbf..32f099fad1 100644
--- a/.xcode-version
+++ b/.xcode-version
@@ -1 +1 @@
-Xcode 16.4
+Xcode 26.0
diff --git a/ci_scripts/ci_pre_xcodebuild.sh b/ci_scripts/ci_pre_xcodebuild.sh
index 054a396394..6a6d860bba 100755
--- a/ci_scripts/ci_pre_xcodebuild.sh
+++ b/ci_scripts/ci_pre_xcodebuild.sh
@@ -2,7 +2,5 @@
 
 set -eux
 
-if [ "${CI_WORKFLOW-}" = "Nightly (Xcode 26)" ]; then
-    : "Downloading Metal Toolchain for Xcode 26"
-    xcodebuild -downloadComponent MetalToolchain
-fi
+: "Downloading Metal Toolchain"
+xcodebuild -downloadComponent MetalToolchain