diff --git a/MODULE.bazel b/MODULE.bazel
index 68e4c26..4d15c03 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-27.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8735610260096797105.
-    commit = "801fb32919777aefd7a734ce9c2c1e6aec782ab7",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8735609849242996849.
+    commit = "8f18755dc9a225caacf2b190d1114ebfda4a2642",
     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-27.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8735610260096797105.
-    commit = "801fb32919777aefd7a734ce9c2c1e6aec782ab7",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8735609849242996849.
+    commit = "8f18755dc9a225caacf2b190d1114ebfda4a2642",
     remote = "https://pigweed.googlesource.com/pigweed/pigweed",
     strip_prefix = "pw_toolchain_bazel",
 )