diff --git a/images/macos/scripts/build/Install-Xcode.ps1 b/images/macos/scripts/build/Install-Xcode.ps1
index 9adb2a50e..9ef03bd49 100644
--- a/images/macos/scripts/build/Install-Xcode.ps1
+++ b/images/macos/scripts/build/Install-Xcode.ps1
@@ -35,7 +35,7 @@ $xcodeVersions | ForEach-Object {
     Write-Host "Configuring Xcode $($_.link) ..."
     Invoke-XcodeRunFirstLaunch -Version $_.link
     Install-XcodeAdditionalSimulatorRuntimes -Version $_.link -Arch $arch -Runtimes $_.install_runtimes
-    if (($_.link -eq "26.0.1")) {
+    if ($_.link -match '^(\d+)\.(\d+)(?:\.(\d+))?$' -and [int]$matches[1] -ge 26) {
         Install-XcodeAdditionalComponents -Version $_.link
         Update-DyldCache -Version $_.link
     }
diff --git a/images/macos/toolsets/toolset-15.json b/images/macos/toolsets/toolset-15.json
index db394d377..72d97b882 100644
--- a/images/macos/toolsets/toolset-15.json
+++ b/images/macos/toolsets/toolset-15.json
@@ -3,21 +3,13 @@
         "default": "16.4",
         "x64": {
             "versions": [
-                {
-                    "link": "26.2_beta_2",
-                    "filename": "Xcode_26.2_beta_2_Universal",
-                    "version": "26.2_beta_2+17C5038g",
-                    "symlinks": ["26.2"],
-                    "sha256": "eb8fd7fc889e940450c5a48600276810a011f36314c43d632253d0fc4d40e2c7",
-                    "install_runtimes": "none"
-                },
                 {
                     "link": "26.1.1",
                     "filename": "Xcode_26.1.1_Universal",
                     "version": "26.1.1+17B100",
                     "symlinks": ["26.1"],
                     "sha256": "ed55d55fa28455c11a65e0809ba8fdf7d83fdeb268aabf9af7fcc1ee911543eb",
-                    "install_runtimes": "none"
+                    "install_runtimes": "default"
                 },
                 {
                     "link": "26.0.1",
@@ -71,21 +63,13 @@
         },
         "arm64":{
             "versions": [
-                {
-                    "link": "26.2_beta_2",
-                    "filename": "Xcode_26.2_beta_2_Universal",
-                    "version": "26.2_beta_2+17C5038g",
-                    "symlinks": ["26.2"],
-                    "sha256": "eb8fd7fc889e940450c5a48600276810a011f36314c43d632253d0fc4d40e2c7",
-                    "install_runtimes": "none"
-                },
                 {
                     "link": "26.1.1",
                     "filename": "Xcode_26.1.1_Universal",
                     "version": "26.1.1+17B100",
                     "symlinks": ["26.1"],
                     "sha256": "ed55d55fa28455c11a65e0809ba8fdf7d83fdeb268aabf9af7fcc1ee911543eb",
-                    "install_runtimes": "none"
+                    "install_runtimes": "default"
                 },
                 {
                     "link": "26.0.1",
diff --git a/images/macos/toolsets/toolset-26.json b/images/macos/toolsets/toolset-26.json
index a6718c03d..0b2d113e5 100644
--- a/images/macos/toolsets/toolset-26.json
+++ b/images/macos/toolsets/toolset-26.json
@@ -17,7 +17,7 @@
                     "version": "26.1.1+17B100",
                     "symlinks": ["26.1"],
                     "sha256": "ed55d55fa28455c11a65e0809ba8fdf7d83fdeb268aabf9af7fcc1ee911543eb",
-                    "install_runtimes": "none"
+                    "install_runtimes": "default"
                 },
                 {
                     "link": "26.0.1",