diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
index b0d6a925f0..c5f6e4fead 100644
--- a/.github/workflows/submit.yml
+++ b/.github/workflows/submit.yml
@@ -1350,7 +1350,7 @@ jobs:
 
   macos_x64_build:
     name: macOS x64
-    runs-on: "macos-13"
+    runs-on: "macos-15-intel"
     needs: prerequisites
     if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_macos_x64 != 'false'
 
@@ -1417,7 +1417,7 @@ jobs:
         run: brew install make gawk
 
       - name: Select Xcode version
-        run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
+        run: sudo xcode-select --switch /Applications/Xcode_16.4.app/Contents/Developer
 
       # Remove once JDK-8376511 has been completed
       - name: Checkout the Apple Openjdk
@@ -1467,7 +1467,7 @@ jobs:
 
   macos_x64_test:
     name: macOS x64
-    runs-on: "macos-13"
+    runs-on: "macos-15-intel"
     needs:
       - prerequisites
       - macos_x64_build
@@ -1556,7 +1556,7 @@ jobs:
         run: brew install make gawk
 
       - name: Select Xcode version
-        run: sudo xcode-select --switch /Applications/Xcode_14.3.1.app/Contents/Developer
+        run: sudo xcode-select --switch /Applications/Xcode_16.4.app/Contents/Developer
 
       - name: Run tests
         run: >