diff --git a/pw_env_setup/bazel_only.json b/pw_env_setup/bazel_only.json
new file mode 100644
index 0000000..bb6900a
--- /dev/null
+++ b/pw_env_setup/bazel_only.json
@@ -0,0 +1,13 @@
+{
+  "cipd_package_files": [
+    "pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json",
+    "pw_env_setup/py/pw_env_setup/cipd_setup/python.json",
+  ],
+  "virtualenv": {
+    "gn_root": ".",
+    "gn_targets": [
+      ":python.install",
+      ":target_support_packages.install"
+    ]
+  }
+}
diff --git a/pw_env_setup/compatibility.json b/pw_env_setup/compatibility.json
index 07db79a..d580972 100644
--- a/pw_env_setup/compatibility.json
+++ b/pw_env_setup/compatibility.json
@@ -1,6 +1,8 @@
 {
   "cipd_package_files": [
     "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",
+    "pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json",
+    "pw_env_setup/py/pw_env_setup/cipd_setup/python.json",
     "pw_env_setup/py/pw_env_setup/cipd_setup/luci.json",
     "pw_env_setup/py/pw_env_setup/cipd_setup/compatibility.json"
   ],
diff --git a/pw_env_setup/config.json b/pw_env_setup/config.json
index 435be72..4101841 100644
--- a/pw_env_setup/config.json
+++ b/pw_env_setup/config.json
@@ -1,6 +1,8 @@
 {
   "cipd_package_files": [
     "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",
+    "pw_env_setup/py/pw_env_setup/cipd_setup/python.json",
+    "pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json",
     "pw_env_setup/py/pw_env_setup/cipd_setup/luci.json"
   ],
   "virtualenv": {
diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json b/pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json
new file mode 100644
index 0000000..a24128e
--- /dev/null
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json
@@ -0,0 +1,13 @@
+[
+  {
+    "_comment": "TODO(pwbug/93): Package Bazel for Windows.",
+    "path": "fuchsia/third_party/bazel/${platform}",
+    "platforms": [
+      "linux-amd64",
+      "mac-amd64"
+    ],
+    "tags": [
+      "version:4.0.0"
+    ]
+  }
+]
diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/python.json b/pw_env_setup/py/pw_env_setup/cipd_setup/python.json
new file mode 100644
index 0000000..3c46046
--- /dev/null
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/python.json
@@ -0,0 +1,15 @@
+[
+  {
+    "_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"
+    ],
+    "tags": [
+      "version:3.8.2.chromium.10"
+    ]
+  }
+]