diff --git a/.bazelversion b/.bazelversion
index 53031b1..41b382c 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-d62e0a0f32188e1875bb8e62ef4377ea4dc1aab2
+1ff5af18d045e8f30a2a0367470db4e8225a785c
diff --git a/MODULE.bazel b/MODULE.bazel
index 71df67e..e3b0a89 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -49,8 +49,8 @@
     module_name = "pigweed",
     # ROLL: Warning: this entry is automatically updated.
     # ROLL: Last updated 2024-09-25.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8735797282214135457.
-    commit = "a78ddd06be398fd4cd0289dd6b514c9325e513bc",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8735791414512571265.
+    commit = "8c7b09401b950d46233ba4b6c0a2783fa429543e",
     remote = "https://pigweed.googlesource.com/pigweed/pigweed",
 )
 
@@ -58,8 +58,8 @@
     module_name = "pw_toolchain",
     # ROLL: Warning: this entry is automatically updated.
     # ROLL: Last updated 2024-09-25.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8735797282214135457.
-    commit = "a78ddd06be398fd4cd0289dd6b514c9325e513bc",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8735791414512571265.
+    commit = "8c7b09401b950d46233ba4b6c0a2783fa429543e",
     remote = "https://pigweed.googlesource.com/pigweed/pigweed",
     strip_prefix = "pw_toolchain_bazel",
 )