diff --git a/third_party/game-patches b/third_party/game-patches
index 24f97cae2..3b4d4085a 160000
--- a/third_party/game-patches
+++ b/third_party/game-patches
@@ -1 +1 @@
-Subproject commit 24f97cae2a59342f0ce75c8e2f692789d6ebf906
+Subproject commit 3b4d4085a307715e6151f5de98970959362fade1
diff --git a/third_party/optimized-settings b/third_party/optimized-settings
index 18cb3bb91..38b6d6d04 160000
--- a/third_party/optimized-settings
+++ b/third_party/optimized-settings
@@ -1 +1 @@
-Subproject commit 18cb3bb91333600e6aa19e1d4c1551840b40fb21
+Subproject commit 38b6d6d04acced84e421d4c511b908fc79d25477
diff --git a/xenia-build.py b/xenia-build.py
index 4a2ba4a81..79ec60c41 100755
--- a/xenia-build.py
+++ b/xenia-build.py
@@ -568,6 +568,7 @@ def get_pr_number():
 def git_submodule_update():
     """Runs a git submodule init and update.
     """
+    # First, update all submodules to their recorded commits
     shell_call([
         "git",
         "-c",
@@ -579,6 +580,18 @@ def git_submodule_update():
         "-j", f"{os.cpu_count()}",
         ])
 
+    # Then update only submodules that track branches to their latest
+    # Currently: optimized-settings and game-patches track 'main'
+    for submodule in ["third_party/optimized-settings", "third_party/game-patches"]:
+        shell_call([
+            "git",
+            "submodule",
+            "update",
+            "--remote",
+            "--depth=1",
+            submodule
+        ])
+
 
 def get_cc(cc=None):
     if sys.platform == "linux":