diff --git a/WORKSPACE b/WORKSPACE
index a48e214..f8008e5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -84,8 +84,8 @@
     name = "pigweed",
     # ROLL: Warning: this entry is automatically updated.
     # ROLL: Last updated 2024-06-18.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8744769428628475537.
-    commit = "42504afa03234e3276471f16d4f23ce571c38ccd",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8744769031393508113.
+    commit = "2ae7586e1ca9644ec9937637880cd5b330f1676b",
     remote = "https://pigweed.googlesource.com/pigweed/pigweed.git",
 )
 
@@ -93,8 +93,8 @@
     name = "pw_toolchain",
     # ROLL: Warning: this entry is automatically updated.
     # ROLL: Last updated 2024-06-18.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8744769428628475537.
-    commit = "42504afa03234e3276471f16d4f23ce571c38ccd",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8744769031393508113.
+    commit = "2ae7586e1ca9644ec9937637880cd5b330f1676b",
     remote = "https://pigweed.googlesource.com/pigweed/pigweed.git",
     strip_prefix = "pw_toolchain_bazel",
 )