diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml
index 9099026a0..7fc91ff89 100644
--- a/.github/workflows/abtesting.yml
+++ b/.github/workflows/abtesting.yml
@@ -61,7 +61,7 @@ jobs:
     runs-on: macOS-15
     strategy:
       matrix:
-        xcode: ["16.1"]
+        xcode: ["16.4"]
         os: [iOS, tvOS, macOS, watchOS, catalyst]
         include:
           - os: iOS
diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml
index 60a316853..e31a6576f 100644
--- a/.github/workflows/analytics.yml
+++ b/.github/workflows/analytics.yml
@@ -35,7 +35,7 @@ jobs:
         # TODO: Re-enable when ODM2 catalyst support is investigated
         # os: [iOS, catalyst, tvOS, macOS]        
         os: [iOS, tvOS, macOS]
-        xcode: ["16.1"]
+        xcode: ["16.4"]
         include:
           - os: iOS
             device: iPhone 16
diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml
index b5f23532c..e4b788785 100644
--- a/.github/workflows/crashlytics.yml
+++ b/.github/workflows/crashlytics.yml
@@ -57,7 +57,7 @@ jobs:
     runs-on: macOS-15
     strategy:
       matrix:
-        xcode: ["16.1"]
+        xcode: ["16.4"]
         os: [iOS, tvOS, macOS, watchOS]
         include:
           - os: iOS
diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index f3b725611..acf22c313 100644
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -56,7 +56,7 @@ jobs:
     runs-on: macOS-15
     strategy:
       matrix:
-        xcode: ["16.1"]
+        xcode: ["16.4"]
         os: [iOS, tvOS, macOS]
         include:
           - os: iOS
diff --git a/.github/workflows/firebaseai.yml b/.github/workflows/firebaseai.yml
index ba2cfa86c..eb3357cdb 100644
--- a/.github/workflows/firebaseai.yml
+++ b/.github/workflows/firebaseai.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: macOS-15
     strategy:
       matrix:
-        xcode: ["16.3"]
+        xcode: ["16.4"]
         os: [iOS]
         include:
           - os: iOS
diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml
index 89f92dfd3..93c0ea57e 100644
--- a/.github/workflows/functions.yml
+++ b/.github/workflows/functions.yml
@@ -32,7 +32,7 @@ jobs:
     runs-on: macOS-15
     strategy:
       matrix:
-        xcode: ["16.1"]
+        xcode: ["16.4"]
         os: [iOS, tvOS, macOS]
         include:
           - os: iOS
diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml
index 114ab58b1..1c014a33e 100644
--- a/.github/workflows/performance.yml
+++ b/.github/workflows/performance.yml
@@ -60,7 +60,7 @@ jobs:
     runs-on: macOS-15
     strategy:
       matrix:
-        xcode: ["16.1"]
+        xcode: ["16.4"]
         os: [iOS, tvOS]
         include:
           - os: iOS
diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
index 4dc4963e8..2cefc3bcb 100644
--- a/.github/workflows/storage.yml
+++ b/.github/workflows/storage.yml
@@ -58,7 +58,7 @@ jobs:
     runs-on: macOS-15
     strategy:
       matrix:
-        xcode: ["16.1"]
+        xcode: ["16.4"]
         os: [iOS, tvOS, macOS]
         include:
           - os: iOS
diff --git a/scripts/build-for-testing.sh b/scripts/build-for-testing.sh
index 94ba507ea..b36acbac8 100755
--- a/scripts/build-for-testing.sh
+++ b/scripts/build-for-testing.sh
@@ -90,7 +90,7 @@ function xcb() {
 }
 
 # Run xcodebuild
-sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
+sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
 xcb "${flags[@]}"
 echo "$message"
 
diff --git a/scripts/test.sh b/scripts/test.sh
index de3c3c20a..bbc78fb45 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -20,8 +20,8 @@
 
 set -euo pipefail
 
-if [ -d "/Applications/Xcode_16.2.app" ]; then
-    xcode_version="16.2"
+if [ -d "/Applications/Xcode_16.4.app" ]; then
+    xcode_version="16.4"
     iphone_version="16"
 else
     xcode_version="15.3"