diff --git a/manifest/west.yml b/manifest/west.yml
index 28e9758..99eaee1 100644
--- a/manifest/west.yml
+++ b/manifest/west.yml
@@ -18,12 +18,12 @@
       name: pigweed
       path: third_party/pigweed
       remote: google
-      revision: main
+      revision: 83816fda4ae0793d21e79c1ef90e53fe4176ebe4  # Latest as of April 3, 2024
     - import: true
       name: zephyr
       path: third_party/zephyr
       remote: zephyrproject-rtos
-      revision: main
+      revision: c719aedb0d960e1450137e7cecf24bb3922d3bf3  # v3.6.0
   remotes:
     - name: google
       url-base: git@github.com:google
diff --git a/third_party/pigweed b/third_party/pigweed
index 42616d8..83816fd 160000
--- a/third_party/pigweed
+++ b/third_party/pigweed
@@ -1 +1 @@
-Subproject commit 42616d83123f2176914d091f973088980dcf7e1a
+Subproject commit 83816fda4ae0793d21e79c1ef90e53fe4176ebe4
diff --git a/third_party/zephyr b/third_party/zephyr
index 7ffafd9..c719aed 160000
--- a/third_party/zephyr
+++ b/third_party/zephyr
@@ -1 +1 @@
-Subproject commit 7ffafd9b6473d229e712bc67e9759042a49483f7
+Subproject commit c719aedb0d960e1450137e7cecf24bb3922d3bf3