diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json b/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json
index 0eb60f0..84d2578 100644
--- a/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json
@@ -2,10 +2,10 @@
   {
     "path": "gn/gn/${platform}",
     "platforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "mac-amd64",
-        "windows-amd64"
+      "linux-amd64",
+      "linux-arm64",
+      "mac-amd64",
+      "windows-amd64"
     ],
     "tags": [
       "git_revision:39a87c0b36310bdf06b692c098f199a0d97fc810"
@@ -14,9 +14,9 @@
   {
     "path": "infra/ninja/${platform}",
     "platforms": [
-        "linux-amd64",
-        "mac-amd64",
-        "windows-amd64"
+      "linux-amd64",
+      "mac-amd64",
+      "windows-amd64"
     ],
     "tags": [
       "version:1.9.0"
@@ -25,9 +25,9 @@
   {
     "path": "infra/cmake/${platform}",
     "platforms": [
-        "linux-amd64",
-        "mac-amd64",
-        "windows-amd64"
+      "linux-amd64",
+      "mac-amd64",
+      "windows-amd64"
     ],
     "tags": [
       "version:3.16.1"
@@ -37,8 +37,8 @@
     "_comment": "TODO(pwbug/93): Package Bazel for Windows.",
     "path": "fuchsia/third_party/bazel/${platform}",
     "platforms": [
-        "linux-amd64",
-        "mac-amd64"
+      "linux-amd64",
+      "mac-amd64"
     ],
     "tags": [
       "version:4.0.0"
@@ -47,8 +47,8 @@
   {
     "path": "pigweed/third_party/bloaty-embedded/${platform}",
     "platforms": [
-        "linux-amd64",
-        "mac-amd64"
+      "linux-amd64",
+      "mac-amd64"
     ],
     "tags": [
       "git_revision:2d87d204057b419f5290f8d38b61b9c2c5b4fb52-2"
@@ -57,9 +57,9 @@
   {
     "path": "pigweed/third_party/gcc-arm-none-eabi/${platform}",
     "platforms": [
-        "linux-amd64",
-        "mac-amd64",
-        "windows-amd64"
+      "linux-amd64",
+      "mac-amd64",
+      "windows-amd64"
     ],
     "tags": [
       "version:10-2020-q4-major"
@@ -68,10 +68,10 @@
   {
     "path": "infra/3pp/tools/protoc/${platform}",
     "platforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "mac-amd64",
-        "windows-amd64"
+      "linux-amd64",
+      "linux-arm64",
+      "mac-amd64",
+      "windows-amd64"
     ],
     "tags": [
       "version:3.14.0"
@@ -81,9 +81,9 @@
     "_comment": "TODO(pwbug/70) Put clang in cipd for Windows.",
     "path": "fuchsia/third_party/clang/${platform}",
     "platforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "mac-amd64"
+      "linux-amd64",
+      "linux-arm64",
+      "mac-amd64"
     ],
     "tags": [
       "git_revision:3dc24bc31edbc01dea085b24a6a6b024d7ae531c"
@@ -93,10 +93,10 @@
     "_comment": "When bumping the minor version (e.g., to 3.9.x) also update env_setup/virtualenv/init.py to check for the new version.",
     "path": "infra/3pp/tools/cpython3/${platform}",
     "platforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "mac-amd64",
-        "windows-amd64"
+      "linux-amd64",
+      "linux-arm64",
+      "mac-amd64",
+      "windows-amd64"
     ],
     "tags": [
       "version:3.8.2.chromium.10"
@@ -105,10 +105,10 @@
   {
     "path": "infra/3pp/tools/go/${platform}",
     "platforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "mac-amd64",
-        "windows-amd64"
+      "linux-amd64",
+      "linux-arm64",
+      "mac-amd64",
+      "windows-amd64"
     ],
     "tags": [
       "version:2@1.16.3"
@@ -117,9 +117,9 @@
   {
     "path": "pigweed/third_party/protoc-gen-go/${platform}",
     "platforms": [
-        "linux-amd64",
-        "mac-amd64",
-        "windows-amd64"
+      "linux-amd64",
+      "mac-amd64",
+      "windows-amd64"
     ],
     "tags": [
       "version:1.3.2"
@@ -129,8 +129,8 @@
     "_comment": "TODO(pwbug/66) Put openocd in cipd for Windows.",
     "path": "pigweed/third_party/openocd/${platform}",
     "platforms": [
-        "linux-amd64",
-        "mac-amd64"
+      "linux-amd64",
+      "mac-amd64"
     ],
     "tags": [
       "git_revision:e41c0f4906e46d1076ce62a0da5518aa1ca280b8"
@@ -139,7 +139,7 @@
   {
     "path": "pigweed/third_party/mingw64-x86_64-win32-seh/${platform}",
     "platforms": [
-        "windows-amd64"
+      "windows-amd64"
     ],
     "tags": [
       "version:10.2.0-11"
@@ -148,9 +148,9 @@
   {
     "path": "pigweed/host_tools/${platform}",
     "platforms": [
-        "linux-amd64",
-        "mac-amd64",
-        "windows-amd64"
+      "linux-amd64",
+      "mac-amd64",
+      "windows-amd64"
     ],
     "tags": [
       "git_revision:3f00a3eb4957306eab148fe3651844e46df5b379"
@@ -159,8 +159,8 @@
   {
     "path": "infra/rbe/client/${platform}",
     "platforms": [
-        "linux-amd64",
-        "windows-amd64"
+      "linux-amd64",
+      "windows-amd64"
     ],
     "tags": [
       "git_revision:8e834982e020c12b7c3c1f106961cead3d65dec1"
@@ -169,9 +169,9 @@
   {
     "path": "fuchsia/third_party/qemu/${platform}",
     "platforms": [
-        "linux-amd64",
-        "linux-arm64",
-        "mac-amd64"
+      "linux-amd64",
+      "linux-arm64",
+      "mac-amd64"
     ],
     "tags": [
       "git_revision:841f14e74f5af7886cf49cfcd4fed264911ae58e"
@@ -180,7 +180,7 @@
   {
     "path": "fuchsia/third_party/kythe",
     "platforms": [
-        "linux-amd64"
+      "linux-amd64"
     ],
     "subdir": "kythe",
     "tags": [
@@ -190,7 +190,7 @@
   {
     "path": "fuchsia/third_party/kythe-libs/${platform}",
     "platforms": [
-        "linux-amd64"
+      "linux-amd64"
     ],
     "subdir": "kythe",
     "tags": [
@@ -200,7 +200,7 @@
   {
     "path": "infra/3pp/tools/renode/${platform}",
     "platforms": [
-        "linux-amd64"
+      "linux-amd64"
     ],
     "tags": [
       "version:2@renode-1.11.0+20210306gite7897c1"