diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/.cipd_version b/pw_env_setup/py/pw_env_setup/cipd_setup/.cipd_version
index 56a7c92305..1e4a463dad 100644
--- a/pw_env_setup/py/pw_env_setup/cipd_setup/.cipd_version
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/.cipd_version
@@ -1 +1 @@
-git_revision:99db35a1ffbf4c09072dde27eed684db319cf751
+git_revision:60772a36be6eec73e8e7d34e3da485ea46a83a9f
diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/.cipd_version.digests b/pw_env_setup/py/pw_env_setup/cipd_setup/.cipd_version.digests
index 1737a5f6b8..86b222a027 100644
--- a/pw_env_setup/py/pw_env_setup/cipd_setup/.cipd_version.digests
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/.cipd_version.digests
@@ -1,43 +1,43 @@
 # This file was generated by
 #
 #  cipd selfupdate-roll -version-file .cipd_version \
-#      -version git_revision:99db35a1ffbf4c09072dde27eed684db319cf751
+#      -version git_revision:60772a36be6eec73e8e7d34e3da485ea46a83a9f
 #
 # Do not modify manually. All changes will be overwritten.
 # Use 'cipd selfupdate-roll ...' to modify.
 
-aix-ppc64        sha256  77fcb5b5880ec2bfd407108e5055d378964b18ad0a9fd8114add3cb42207a59b
-dragonfly-amd64  sha256  fe2c4051d30c3f5c3395dd76dd656bee82cb756e35707cca236e277f74f3980c
-freebsd-386      sha256  b5a52aa2f4645b5d64debc5cfa578af752f30efdb6795e7e23463203c43e9bf9
-freebsd-amd64    sha256  14426b39c36ab37e8c7f779e8f7a38d7923b0bbe092e1c8b346322db6612f506
-freebsd-arm64    sha256  7f689e45dd8184e70589a44488dbe01119f8e5bf44c720e7d6e7f724a0fdb4da
-freebsd-riscv64  sha256  8227da9ccf4e7323b9905f6619064abf73a0b51b109bdd6657c60b9d0c99d508
-illumos-amd64    sha256  bb9b467538b2857403afb61f0b42e2beb483687af494832fe3c963b3738edca5
-linux-386        sha256  c2bf4ea6d9b7c112d5a312df7123f3917e1bf086db5179bf6488566cc4696a4c
-linux-amd64      sha256  6243b51f298bf605d3c08b2b3eff2ca21de25512f1daccfb37ace82b77ec2223
-linux-arm64      sha256  aab522643f9f74671ff50fc5ba6fbd960e84003d859ba36f7cb96d17363be8cd
-linux-armv6l     sha256  eb098a3a2ec39757382dc034c8df0c47f17ab879da76b3efdced968664e7b6d0
-linux-loong64    sha256  2f61800fc0e82760785b8de1a338f70525183eedf0b77b429ce60117b6d52916
-linux-mips       sha256  51aff0ccf6b0d444280c7978d2b109d3a8fc6aed764f8043caf59321020ed002
-linux-mips64     sha256  4dd79852423604a7249e973666261fc3eeca7152dfd601c285f863d5b64b4f2e
-linux-mips64le   sha256  f8e82c9cf38219c19a7ac79b8a011ae283a5cc0503d06f8a6bb9ae5d90eee64e
-linux-mipsle     sha256  5c3232b47c9fe4074f31714046567550471d3ef103f31659d1834297ab8a84fb
-linux-ppc64      sha256  f5974537eaac1deb4ec5b1d03a54fcaccbc824f247600befc4a152a995a07e33
-linux-ppc64le    sha256  569becc552d8f511ba9312d0adb8bdea2a0192783d836c76203b470c7015420e
-linux-riscv64    sha256  a36499adca7241ea5601c0d4f66ae344957f45480103f9e875ec837add281e63
-linux-s390x      sha256  92b38e04cd62ba7a41b6b91167646f07e32d7accb6b4ab18ed97f1f37371bd99
-mac-amd64        sha256  6dd1db5c99f0e2ffabd8728c5c488c1cf2a6edaa070318fcf886505574988d8c
-mac-arm64        sha256  e389de2aa365b55e3174c02e2e0daa9bd78d39b8edfa4c6f91bf61967dabbdca
-netbsd-386       sha256  b3c22d5f4d6fd1821d8e78d90185e11d2995610234b27c2b85566482da3bc8e6
-netbsd-amd64     sha256  6ab2ee40aaa5824a92b6483c1b435b4621bc7d5ce58540d79be8911adab7dac6
-netbsd-arm64     sha256  e6ee2b7897f3d39dab0aa1b2933a1807cf971b7fe0e7fa0b95e575c1ec7cea91
-netbsd-armv6l    sha256  c49573be1494c67373aa01193a922c8e4498b6594f9582096b37c3502a82fe71
-openbsd-386      sha256  ebdb347694213d8302489221c1f7fa02ee88200cf0ea3cb9b79837b8bb1bbc0e
-openbsd-amd64    sha256  7d4da4d27f2dab21b709d8b24d7dbf4016392eb364e2ad7429bc8cf6d098413d
-openbsd-arm64    sha256  6f1b156caeb275d9d98d56826b3011bdd9c32b8205b0088ba82a5a0d2132ceed
-openbsd-ppc64    sha256  7171875badb1ff0c8d9b7fb847f270eab7c3a6a5d895eedea45830ad6b0b38fd
-openbsd-riscv64  sha256  3dc19e4d769c7badde22e0f0c9cfaf2802e08378c15ac676f1f5e2a980c7ed74
-solaris-amd64    sha256  4eb2f955d922f928fec37de8f1bdce84bcefaa9d26bccd4b5172f7c3b1a663c0
-windows-386      sha256  af73f0a8b5e95c19f6bb706516fd15df8a62a41eec9534af0615d91d139fc3f4
-windows-amd64    sha256  d16b106aaa28f81d01aba655b383489d67ae4f5309edbe7efaebd99382a3fd11
-windows-arm64    sha256  b49723d1399cba1a523d98386ad1bd9fd7df919913326334c7d2206b13d66135
+aix-ppc64        sha256  81a8e58a53b113f1119b7d7e7fe26c437e0ac4961662dfb65c2f164a7d0a7024
+dragonfly-amd64  sha256  3fb21ff3a657d01a6fc7376df7b42963b3fcd485a2c044dc730bd3123426cb95
+freebsd-386      sha256  c03d992802e0321aa952dd4cb9110142ebf79aa58aea63eee55610dd87b489c0
+freebsd-amd64    sha256  cf1791105c1e62e8436a382c9788516a49d9c8af4ed193d443cf6f4c27c5d3e9
+freebsd-arm64    sha256  5445c3850cb7cc5a9e3a08d571399e50ded2f98ab3656af8329c4721dc7622e0
+freebsd-riscv64  sha256  60d52ce9fac19945df0729f915fd70d63d51967cc6947a14aa3fdeb61d4a77d3
+illumos-amd64    sha256  1443dc8348239997ffdabbf3ebcea216659f9b7c9c797490116bab8bc4da54ad
+linux-386        sha256  011a028ee922e60c438798c66aeac4c93a1d05564e7f6395d265a0f05962d0e0
+linux-amd64      sha256  00550c023987b4a8e95efbf369bc8cb6dd3d596e44d3e1c199098468994f41dc
+linux-arm64      sha256  eb22b38207946b730286885147438a4eb77f78852a0276a88eb05aa66a203fa9
+linux-armv6l     sha256  d07f8eb0f9827e37caabb1f5edada46ae868f8945d02a3555c87d4d68ba6f30b
+linux-loong64    sha256  796a38871389ec91f77c3c64df9e5a0a43b841816632389055d329fa7c321d40
+linux-mips       sha256  2d876c9bff951d45a8e44e5b8d6d8c5b0dfd66e3ed1ca5f1843d76d3e9068cd4
+linux-mips64     sha256  0b1ccaae1e99ff961423ce2ba204300677131740166fd3ecdfb3bb29af30e9d7
+linux-mips64le   sha256  8fbd9803de124e82fda203756d9500b65943a467868326a5388b8b6a27d42792
+linux-mipsle     sha256  a85714d8b7fd15194750d705fa7e2e20fe319569990eac41a6a4266e61b8fd6e
+linux-ppc64      sha256  8d8526bab56d159185e3df76843cbe6754c7a7a9caa822bfa14569b8ac569474
+linux-ppc64le    sha256  d20f5aad42d824caeca16869e1684fc1244fcede4a27add698262fed116912c9
+linux-riscv64    sha256  1c96677568a3af08d1f7182fd7d5959054ace2decc4be5190a67506a0209b4c3
+linux-s390x      sha256  731e2e95b2e64c313a7dcd3047c42a6ca7480133f66e9e1f6076478be6e59f9e
+mac-amd64        sha256  efc442906017c32a58501f21eeb61748d9cd7dedf71afcee8b0f4c07a193cb8a
+mac-arm64        sha256  260157c890a2ccd7e4925218a4b7b6d6a2fc8e6bc419c80fe6b1c38e7859939b
+netbsd-386       sha256  623cfa9b76d2df49015382496ab835595650e66a4df6918e921cbb47cc2490ac
+netbsd-amd64     sha256  d5b7e17410b1eed6ba02ce8a0221a6a46236eb79fe5dc40877c2af9be4b4fcd0
+netbsd-arm64     sha256  24b30776bb3b666b894586493067221cbf1c4216e6f6c6187f688cfca39a21d2
+netbsd-armv6l    sha256  1b0e2d4accc1f02938f9f1aab0fc4b39719588083456c1fecad44d7d4e373854
+openbsd-386      sha256  a0ca5cf838917a37d4bc8b8a911f46a14f6e9f6be8fe1cc08a6493a0f402ea29
+openbsd-amd64    sha256  3c73ff0c7e91f459629ca1266b4f1b964518e4c4a94875ad5ff1754c74d5c8b2
+openbsd-arm64    sha256  d276afe5dd1d17e014226dd2df8725135f094b6be17713ef8f12b5e3cfb02a8b
+openbsd-ppc64    sha256  6ed99a0eb3ea2a627233aef879edb1848f444d3c4a847d6c5de479b6c02c1519
+openbsd-riscv64  sha256  57ee0ead170826be48830774a3519249505256577f6ffa946eca9fa8742e171a
+solaris-amd64    sha256  dcc937fa186c323b0cfbf8d80bfe32d4b6cbfa336f6b1cc5439634cbaaf03cd3
+windows-386      sha256  bf549fdbe6b4cec51ee0861a600d8eff0bc8b9013fa04c62757ce5f5ac3d4d25
+windows-amd64    sha256  7a6f3656356077e8e258baa16dd0ece700dbc28ef3da8d3495e5e4a2157142f0
+windows-arm64    sha256  d948c9c92407ae3e6c088b95f81905e003cd29a52d0e3352cd65bb9662dc53bd