diff --git a/infra/config/config.star b/infra/config/config.star
index 2fc6311dc2..e5c8f1bb2e 100755
--- a/infra/config/config.star
+++ b/infra/config/config.star
@@ -13,7 +13,7 @@ lucicfg.check_version("1.30.9")
 WEBRTC_GIT = "https://webrtc.googlesource.com/src"
 WEBRTC_GERRIT = "https://webrtc-review.googlesource.com/src"
 WEBRTC_TROOPER_EMAIL = "webrtc-troopers-robots@google.com"
-WEBRTC_XCODE14 = "14c18"
+WEBRTC_XCODE = "15f31d"
 DEFAULT_CPU = "x86-64"
 
 # Helpers:
@@ -707,10 +707,10 @@ def normal_builder_factory(**common_kwargs):
 # Mixins:
 
 ios_builder, ios_try_job = normal_builder_factory(
-    properties = {"xcode_build_version": WEBRTC_XCODE14},
+    properties = {"xcode_build_version": WEBRTC_XCODE},
     caches = [swarming.cache(
-        name = "xcode_ios_" + WEBRTC_XCODE14,
-        path = "xcode_ios_" + WEBRTC_XCODE14 + ".app",
+        name = "xcode_ios_" + WEBRTC_XCODE,
+        path = "xcode_ios_" + WEBRTC_XCODE + ".app",
     )],
 )
 
@@ -746,7 +746,7 @@ ios_builder("iOS64 Debug", "iOS|arm64|dbg")
 ios_try_job("ios_compile_arm64_dbg")
 ios_builder("iOS64 Release", "iOS|arm64|rel")
 ios_try_job("ios_compile_arm64_rel")
-ci_builder("iOS Debug (simulator)", "iOS|x64|sim")
+ios_builder("iOS Debug (simulator)", "iOS|x64|sim")
 ios_try_job("ios_dbg_simulator")
 ios_builder("iOS API Framework Builder", "iOS|fat|size", recipe = "ios_api_framework", prioritized = True)
 ios_try_job("ios_api_framework", recipe = "ios_api_framework")
diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index 46fced9412..2d7f2b7c14 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -1593,13 +1593,13 @@ buckets {
         '  },'
         '  "builder_group": "client.webrtc",'
         '  "recipe": "webrtc/ios_api_framework",'
-        '  "xcode_build_version": "14c18"'
+        '  "xcode_build_version": "15f31d"'
         '}'
       priority: 29
       execution_timeout_secs: 7200
       caches {
-        name: "xcode_ios_14c18"
-        path: "xcode_ios_14c18.app"
+        name: "xcode_ios_15f31d"
+        path: "xcode_ios_15f31d.app"
       }
       build_numbers: YES
       service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1644,10 +1644,15 @@ buckets {
         '    ]'
         '  },'
         '  "builder_group": "client.webrtc",'
-        '  "recipe": "webrtc/standalone"'
+        '  "recipe": "webrtc/standalone",'
+        '  "xcode_build_version": "15f31d"'
         '}'
       priority: 30
       execution_timeout_secs: 7200
+      caches {
+        name: "xcode_ios_15f31d"
+        path: "xcode_ios_15f31d.app"
+      }
       build_numbers: YES
       service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
       experiments {
@@ -1692,13 +1697,13 @@ buckets {
         '  },'
         '  "builder_group": "client.webrtc",'
         '  "recipe": "webrtc/standalone",'
-        '  "xcode_build_version": "14c18"'
+        '  "xcode_build_version": "15f31d"'
         '}'
       priority: 30
       execution_timeout_secs: 7200
       caches {
-        name: "xcode_ios_14c18"
-        path: "xcode_ios_14c18.app"
+        name: "xcode_ios_15f31d"
+        path: "xcode_ios_15f31d.app"
       }
       build_numbers: YES
       service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -1744,13 +1749,13 @@ buckets {
         '  },'
         '  "builder_group": "client.webrtc",'
         '  "recipe": "webrtc/standalone",'
-        '  "xcode_build_version": "14c18"'
+        '  "xcode_build_version": "15f31d"'
         '}'
       priority: 30
       execution_timeout_secs: 7200
       caches {
-        name: "xcode_ios_14c18"
-        path: "xcode_ios_14c18.app"
+        name: "xcode_ios_15f31d"
+        path: "xcode_ios_15f31d.app"
       }
       build_numbers: YES
       service_account: "webrtc-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3382,13 +3387,13 @@ buckets {
         '  },'
         '  "builder_group": "tryserver.webrtc",'
         '  "recipe": "webrtc/ios_api_framework",'
-        '  "xcode_build_version": "14c18"'
+        '  "xcode_build_version": "15f31d"'
         '}'
       priority: 30
       execution_timeout_secs: 7200
       caches {
-        name: "xcode_ios_14c18"
-        path: "xcode_ios_14c18.app"
+        name: "xcode_ios_15f31d"
+        path: "xcode_ios_15f31d.app"
       }
       build_numbers: YES
       service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3434,13 +3439,13 @@ buckets {
         '  },'
         '  "builder_group": "tryserver.webrtc",'
         '  "recipe": "webrtc/standalone",'
-        '  "xcode_build_version": "14c18"'
+        '  "xcode_build_version": "15f31d"'
         '}'
       priority: 30
       execution_timeout_secs: 7200
       caches {
-        name: "xcode_ios_14c18"
-        path: "xcode_ios_14c18.app"
+        name: "xcode_ios_15f31d"
+        path: "xcode_ios_15f31d.app"
       }
       build_numbers: YES
       service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3486,13 +3491,13 @@ buckets {
         '  },'
         '  "builder_group": "tryserver.webrtc",'
         '  "recipe": "webrtc/standalone",'
-        '  "xcode_build_version": "14c18"'
+        '  "xcode_build_version": "15f31d"'
         '}'
       priority: 30
       execution_timeout_secs: 7200
       caches {
-        name: "xcode_ios_14c18"
-        path: "xcode_ios_14c18.app"
+        name: "xcode_ios_15f31d"
+        path: "xcode_ios_15f31d.app"
       }
       build_numbers: YES
       service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -3538,13 +3543,13 @@ buckets {
         '  },'
         '  "builder_group": "tryserver.webrtc",'
         '  "recipe": "webrtc/standalone",'
-        '  "xcode_build_version": "14c18"'
+        '  "xcode_build_version": "15f31d"'
         '}'
       priority: 30
       execution_timeout_secs: 7200
       caches {
-        name: "xcode_ios_14c18"
-        path: "xcode_ios_14c18.app"
+        name: "xcode_ios_15f31d"
+        path: "xcode_ios_15f31d.app"
       }
       build_numbers: YES
       service_account: "webrtc-try-builder@chops-service-accounts.iam.gserviceaccount.com"