diff --git a/scripts/setup/python.json b/scripts/setup/python.json
index 0df6cc494ab40a..4780e23b1ffe17 100644
--- a/scripts/setup/python.json
+++ b/scripts/setup/python.json
@@ -3,7 +3,7 @@
         {
             "path": "infra/3pp/tools/cpython3/${platform}",
             "platforms": ["mac-amd64", "windows-amd64"],
-            "tags": ["version:2@3.9.5.chromium.19"]
+            "tags": ["version:2@3.11.9.chromium.35"]
         }
     ]
 }
diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo
index 1f12d06f5133a9..bbcdd74e4ed948 160000
--- a/third_party/pigweed/repo
+++ b/third_party/pigweed/repo
@@ -1 +1 @@
-Subproject commit 1f12d06f5133a9a471e0551e5f915dff80ee908c
+Subproject commit bbcdd74e4ed948795fddfb3f9e5ac5ccb2e96f66
diff --git a/third_party/pigweed/update.sh b/third_party/pigweed/update.sh
index c8dd96862d7285..b15e967930577b 100644
--- a/third_party/pigweed/update.sh
+++ b/third_party/pigweed/update.sh
@@ -3,8 +3,8 @@
 
 # Update the submodule.
 cd "$(dirname "${BASH_SOURCE[0]}")/repo"
-git fetch origin master
-git checkout origin/master
+git fetch origin main
+git checkout origin/main
 
 # Copy the CIPD manifest but change the Python line so we don't use CIPD
 # Python on Linux.