diff --git a/WORKSPACE b/WORKSPACE
index 015c43f..2cce31d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -84,8 +84,8 @@
     name = "pigweed",
     # ROLL: Warning: this entry is automatically updated.
     # ROLL: Last updated 2024-07-16.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8742295695059062353.
-    commit = "0e7b3303a2e5b35a00a039e8b403c87cca54e225",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8742295313241457393.
+    commit = "2955c4c9a1a048b716c6090481ab93464c87090b",
     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-07-16.
-    # ROLL: By https://cr-buildbucket.appspot.com/build/8742295695059062353.
-    commit = "0e7b3303a2e5b35a00a039e8b403c87cca54e225",
+    # ROLL: By https://cr-buildbucket.appspot.com/build/8742295313241457393.
+    commit = "2955c4c9a1a048b716c6090481ab93464c87090b",
     remote = "https://pigweed.googlesource.com/pigweed/pigweed.git",
     strip_prefix = "pw_toolchain_bazel",
 )