diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 5b2c861..67a2031 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -22,22 +22,22 @@
   "deps": {
     "dart": {
       "branch": "refs/heads/main",
-      "revision": "69039cc67527ef76e185e7210013eeb257640009",
+      "revision": "1c2ff91e7a30afa0dfe9d481fb0870833ae7ce5c",
       "url": "https://dart.googlesource.com/recipes.git"
     },
     "depot_tools": {
       "branch": "refs/heads/main",
-      "revision": "8babcb7e2ec9ffe4e0394a66378423242dd66e6c",
+      "revision": "27ea34f94ea114fec4fc4a10720492dbe8f3d738",
       "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
     },
     "fuchsia": {
       "branch": "refs/heads/main",
-      "revision": "2b961000d53148a5c8c7111f75e62e14661d3aba",
+      "revision": "ac4a351cef58183d5d1432d9fbc0ff5d38b89ce3",
       "url": "https://fuchsia.googlesource.com/infra/recipes.git"
     },
     "recipe_engine": {
       "branch": "refs/heads/main",
-      "revision": "370e254b9a31eb76066c7aa2b05e6422f34fc58c",
+      "revision": "a9a3ff21ca234aa195f732ed848cfe2a1d17d2b2",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },
diff --git a/recipe_modules/adhoc_validation/examples/full.expected/docs.json b/recipe_modules/adhoc_validation/examples/full.expected/docs.json
index 8fb2753..dc70d49 100644
--- a/recipe_modules/adhoc_validation/examples/full.expected/docs.json
+++ b/recipe_modules/adhoc_validation/examples/full.expected/docs.json
@@ -169,7 +169,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -212,7 +212,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipe_modules/build_util/examples/full.expected/basic.json b/recipe_modules/build_util/examples/full.expected/basic.json
index c604f5f..eaeb42e 100644
--- a/recipe_modules/build_util/examples/full.expected/basic.json
+++ b/recipe_modules/build_util/examples/full.expected/basic.json
@@ -39,12 +39,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -52,8 +59,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -68,19 +75,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -95,7 +99,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -110,7 +114,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -120,9 +124,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -141,7 +145,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -149,7 +153,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -159,7 +163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -208,7 +212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -237,7 +241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -261,7 +265,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -333,7 +337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -384,7 +388,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -413,7 +417,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -437,7 +441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -571,7 +575,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411"
     ],
     "infra_step": true,
     "name": "install infra/rbe/client.ensure package directory",
@@ -584,7 +588,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411",
       "-ensure-file",
       "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
       "-max-threads",
@@ -630,8 +634,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/reproxy"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
+      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/reproxy"
     ],
     "env": {
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -696,7 +700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
       "--shutdown"
     ],
     "env": {
diff --git a/recipe_modules/build_util/examples/full.expected/mac.json b/recipe_modules/build_util/examples/full.expected/mac.json
index 6b9217f..f03c8ee 100644
--- a/recipe_modules/build_util/examples/full.expected/mac.json
+++ b/recipe_modules/build_util/examples/full.expected/mac.json
@@ -39,12 +39,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -52,8 +59,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -68,19 +75,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -95,7 +99,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -110,7 +114,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -120,9 +124,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -141,7 +145,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -149,7 +153,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -159,7 +163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -208,7 +212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -237,7 +241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -261,7 +265,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -333,7 +337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -384,7 +388,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -413,7 +417,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -437,7 +441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -571,7 +575,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411"
     ],
     "infra_step": true,
     "name": "install infra/rbe/client.ensure package directory",
@@ -584,7 +588,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411",
       "-ensure-file",
       "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
       "-max-threads",
@@ -630,8 +634,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/reproxy"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
+      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/reproxy"
     ],
     "env": {
       "RBE_cache_dir": "[CACHE]/rbe/deps",
@@ -696,7 +700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
       "--shutdown"
     ],
     "env": {
diff --git a/recipe_modules/build_util/examples/full.expected/win.json b/recipe_modules/build_util/examples/full.expected/win.json
index 61f7633..e6e9f57 100644
--- a/recipe_modules/build_util/examples/full.expected/win.json
+++ b/recipe_modules/build_util/examples/full.expected/win.json
@@ -39,12 +39,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -52,8 +59,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -69,19 +76,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -96,7 +100,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -112,7 +116,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -122,9 +126,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -144,7 +148,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -152,7 +156,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -162,7 +166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -212,7 +216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -242,7 +246,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -267,7 +271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -340,7 +344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -392,7 +396,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -422,7 +426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -447,7 +451,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -582,7 +586,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\infra\\rbe\\client\\re_client_version%3A0.111.0.1ccaa23-gomaip"
+      "[START_DIR]\\cipd_tool\\infra\\rbe\\client\\d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411"
     ],
     "infra_step": true,
     "name": "install infra/rbe/client.ensure package directory",
@@ -595,7 +599,7 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\infra\\rbe\\client\\re_client_version%3A0.111.0.1ccaa23-gomaip",
+      "[START_DIR]\\cipd_tool\\infra\\rbe\\client\\d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411",
       "-ensure-file",
       "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
       "-max-threads",
@@ -641,8 +645,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\infra\\rbe\\client\\re_client_version%3A0.111.0.1ccaa23-gomaip\\bootstrap",
-      "--re_proxy=[START_DIR]\\cipd_tool\\infra\\rbe\\client\\re_client_version%3A0.111.0.1ccaa23-gomaip\\reproxy"
+      "[START_DIR]\\cipd_tool\\infra\\rbe\\client\\d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411\\bootstrap",
+      "--re_proxy=[START_DIR]\\cipd_tool\\infra\\rbe\\client\\d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411\\reproxy"
     ],
     "env": {
       "RBE_cache_dir": "[CACHE]\\rbe\\deps",
@@ -707,7 +711,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\infra\\rbe\\client\\re_client_version%3A0.111.0.1ccaa23-gomaip\\bootstrap",
+      "[START_DIR]\\cipd_tool\\infra\\rbe\\client\\d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411\\bootstrap",
       "--shutdown"
     ],
     "env": {
diff --git a/recipe_modules/cache/tests/refresh.expected/basic.json b/recipe_modules/cache/tests/refresh.expected/basic.json
index 53377b4..49aecdf 100644
--- a/recipe_modules/cache/tests/refresh.expected/basic.json
+++ b/recipe_modules/cache/tests/refresh.expected/basic.json
@@ -58,7 +58,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "name": "install infra/tools/luci/cas.ensure package directory",
@@ -71,7 +71,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -98,7 +98,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -115,7 +115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -214,7 +214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -247,7 +247,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipe_modules/cache/tests/refresh.expected/no_cache_file.json b/recipe_modules/cache/tests/refresh.expected/no_cache_file.json
index 4bee941..48647b8 100644
--- a/recipe_modules/cache/tests/refresh.expected/no_cache_file.json
+++ b/recipe_modules/cache/tests/refresh.expected/no_cache_file.json
@@ -40,7 +40,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "name": "install infra/tools/luci/cas.ensure package directory",
@@ -53,7 +53,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -80,7 +80,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -97,7 +97,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -196,7 +196,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -229,7 +229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipe_modules/display_util/examples/display_tasks.expected/Test_Failure.json b/recipe_modules/display_util/examples/display_tasks.expected/Test_Failure.json
index 3a08572..fc75f16 100644
--- a/recipe_modules/display_util/examples/display_tasks.expected/Test_Failure.json
+++ b/recipe_modules/display_util/examples/display_tasks.expected/Test_Failure.json
@@ -13,7 +13,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin"
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227"
     ],
     "infra_step": true,
     "name": "install infra/tools/luci/swarming.ensure package directory",
@@ -26,7 +26,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227",
       "-ensure-file",
       "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
@@ -53,7 +53,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin/swarming",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227/swarming",
       "spawn-tasks",
       "-server",
       "https://example.swarmingserver.appspot.com",
@@ -160,7 +160,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin/swarming",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227/swarming",
       "collect",
       "-server",
       "https://example.swarmingserver.appspot.com",
diff --git a/recipe_modules/display_util/examples/display_tasks.expected/Test_Infra_Failure.json b/recipe_modules/display_util/examples/display_tasks.expected/Test_Infra_Failure.json
index 21fa806..ff07069 100644
--- a/recipe_modules/display_util/examples/display_tasks.expected/Test_Infra_Failure.json
+++ b/recipe_modules/display_util/examples/display_tasks.expected/Test_Infra_Failure.json
@@ -13,7 +13,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin"
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227"
     ],
     "infra_step": true,
     "name": "install infra/tools/luci/swarming.ensure package directory",
@@ -26,7 +26,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227",
       "-ensure-file",
       "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
@@ -53,7 +53,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin/swarming",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227/swarming",
       "spawn-tasks",
       "-server",
       "https://example.swarmingserver.appspot.com",
@@ -160,7 +160,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin/swarming",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227/swarming",
       "collect",
       "-server",
       "https://example.swarmingserver.appspot.com",
diff --git a/recipe_modules/display_util/examples/display_tasks.expected/Test_Success.json b/recipe_modules/display_util/examples/display_tasks.expected/Test_Success.json
index 50f4bb3..86d08dd 100644
--- a/recipe_modules/display_util/examples/display_tasks.expected/Test_Success.json
+++ b/recipe_modules/display_util/examples/display_tasks.expected/Test_Success.json
@@ -13,7 +13,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin"
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227"
     ],
     "infra_step": true,
     "name": "install infra/tools/luci/swarming.ensure package directory",
@@ -26,7 +26,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227",
       "-ensure-file",
       "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
@@ -53,7 +53,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin/swarming",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227/swarming",
       "spawn-tasks",
       "-server",
       "https://example.swarmingserver.appspot.com",
@@ -148,7 +148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin/swarming",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227/swarming",
       "collect",
       "-server",
       "https://example.swarmingserver.appspot.com",
diff --git a/recipe_modules/flutter_bcid/examples/full.expected/basic.json b/recipe_modules/flutter_bcid/examples/full.expected/basic.json
index 9112b40..e048ba7 100644
--- a/recipe_modules/flutter_bcid/examples/full.expected/basic.json
+++ b/recipe_modules/flutter_bcid/examples/full.expected/basic.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipe_modules/flutter_bcid/examples/full.expected/prod_build.json b/recipe_modules/flutter_bcid/examples/full.expected/prod_build.json
index 9112b40..e048ba7 100644
--- a/recipe_modules/flutter_bcid/examples/full.expected/prod_build.json
+++ b/recipe_modules/flutter_bcid/examples/full.expected/prod_build.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json b/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
index 773f107..8877e3e 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/local_engine_cas.json
@@ -427,7 +427,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "name": "install infra/tools/luci/cas.ensure package directory",
@@ -440,7 +440,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -467,7 +467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/local_web_sdk_cas.json b/recipe_modules/flutter_deps/examples/full.expected/local_web_sdk_cas.json
index 853d86f..57b6bc3 100644
--- a/recipe_modules/flutter_deps/examples/full.expected/local_web_sdk_cas.json
+++ b/recipe_modules/flutter_deps/examples/full.expected/local_web_sdk_cas.json
@@ -427,7 +427,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "name": "install infra/tools/luci/cas.ensure package directory",
@@ -440,7 +440,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -467,7 +467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipe_modules/goma/tests/full.expected/linux_arbitrary_toolchain.json b/recipe_modules/goma/tests/full.expected/linux_arbitrary_toolchain.json
index bee2f0c..8a848e7 100644
--- a/recipe_modules/goma/tests/full.expected/linux_arbitrary_toolchain.json
+++ b/recipe_modules/goma/tests/full.expected/linux_arbitrary_toolchain.json
@@ -39,12 +39,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -52,8 +59,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -69,19 +76,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -96,7 +100,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -112,7 +116,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -122,9 +126,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -144,7 +148,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -152,7 +156,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -162,7 +166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -202,7 +206,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -232,7 +236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -257,7 +261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
diff --git a/recipe_modules/goma/tests/full.expected/linux_goma_dir.json b/recipe_modules/goma/tests/full.expected/linux_goma_dir.json
index 1825167..f804b03 100644
--- a/recipe_modules/goma/tests/full.expected/linux_goma_dir.json
+++ b/recipe_modules/goma/tests/full.expected/linux_goma_dir.json
@@ -5,12 +5,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -18,8 +25,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -34,19 +41,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -61,7 +65,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -76,7 +80,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -86,9 +90,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -107,7 +111,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -115,7 +119,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -125,7 +129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "path/to/goma/goma_ctl.py",
       "restart"
     ],
@@ -164,7 +168,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "path/to/goma/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -193,7 +197,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "path/to/goma/goma_ctl.py",
       "stat"
     ],
@@ -217,7 +221,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "path/to/goma/goma_ctl.py",
       "stop"
     ],
diff --git a/recipe_modules/goma/tests/full.expected/linux_invalid_goma_jsonstatus.json b/recipe_modules/goma/tests/full.expected/linux_invalid_goma_jsonstatus.json
index 6c6fc33..fbed229 100644
--- a/recipe_modules/goma/tests/full.expected/linux_invalid_goma_jsonstatus.json
+++ b/recipe_modules/goma/tests/full.expected/linux_invalid_goma_jsonstatus.json
@@ -39,12 +39,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -52,8 +59,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -68,19 +75,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -95,7 +99,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -110,7 +114,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -120,9 +124,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -141,7 +145,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -149,7 +153,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -159,7 +163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -201,7 +205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -229,7 +233,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -253,7 +257,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
diff --git a/recipe_modules/goma/tests/full.expected/linux_jobs.json b/recipe_modules/goma/tests/full.expected/linux_jobs.json
index 7718ba1..af986a9 100644
--- a/recipe_modules/goma/tests/full.expected/linux_jobs.json
+++ b/recipe_modules/goma/tests/full.expected/linux_jobs.json
@@ -39,12 +39,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -52,8 +59,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -68,19 +75,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -95,7 +99,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -110,7 +114,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -120,9 +124,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -141,7 +145,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -149,7 +153,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -159,7 +163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -198,7 +202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -227,7 +231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -251,7 +255,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
diff --git a/recipe_modules/goma/tests/full.expected/linux_non_default_server.json b/recipe_modules/goma/tests/full.expected/linux_non_default_server.json
index 2cddabf..aaa5a26 100644
--- a/recipe_modules/goma/tests/full.expected/linux_non_default_server.json
+++ b/recipe_modules/goma/tests/full.expected/linux_non_default_server.json
@@ -39,12 +39,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -52,8 +59,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -68,19 +75,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -95,7 +99,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -110,7 +114,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -120,9 +124,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -141,7 +145,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -149,7 +153,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -159,7 +163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -198,7 +202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -227,7 +231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -251,7 +255,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
diff --git a/recipe_modules/goma/tests/full.expected/linux_start_goma_failed.json b/recipe_modules/goma/tests/full.expected/linux_start_goma_failed.json
index d68a7b9..10c9e0c 100644
--- a/recipe_modules/goma/tests/full.expected/linux_start_goma_failed.json
+++ b/recipe_modules/goma/tests/full.expected/linux_start_goma_failed.json
@@ -42,12 +42,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -55,8 +62,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -71,19 +78,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -98,7 +102,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -113,7 +117,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -123,9 +127,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -144,7 +148,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -152,7 +156,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -162,7 +166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -187,7 +191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -216,7 +220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
diff --git a/recipe_modules/goma/tests/full.expected/linux_stop_goma_failed.json b/recipe_modules/goma/tests/full.expected/linux_stop_goma_failed.json
index 009317c..3154436 100644
--- a/recipe_modules/goma/tests/full.expected/linux_stop_goma_failed.json
+++ b/recipe_modules/goma/tests/full.expected/linux_stop_goma_failed.json
@@ -39,12 +39,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -52,8 +59,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -68,19 +75,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -95,7 +99,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -110,7 +114,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -120,9 +124,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -141,7 +145,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -149,7 +153,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -159,7 +163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -201,7 +205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -230,7 +234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -254,7 +258,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
diff --git a/recipe_modules/goma/tests/full.expected/mac.json b/recipe_modules/goma/tests/full.expected/mac.json
index 39406e0..b864d3c 100644
--- a/recipe_modules/goma/tests/full.expected/mac.json
+++ b/recipe_modules/goma/tests/full.expected/mac.json
@@ -39,12 +39,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -52,8 +59,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -68,19 +75,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -95,7 +99,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -110,7 +114,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -120,9 +124,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -141,7 +145,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -149,7 +153,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -159,7 +163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -198,7 +202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -227,7 +231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -251,7 +255,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
diff --git a/recipe_modules/goma/tests/full.expected/valid_buildname_and_build_id.json b/recipe_modules/goma/tests/full.expected/valid_buildname_and_build_id.json
index 70d88dc..5827190 100644
--- a/recipe_modules/goma/tests/full.expected/valid_buildname_and_build_id.json
+++ b/recipe_modules/goma/tests/full.expected/valid_buildname_and_build_id.json
@@ -51,12 +51,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -64,8 +71,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -92,19 +99,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -119,7 +123,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -146,7 +150,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -156,9 +160,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -189,7 +193,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -197,7 +201,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -207,7 +211,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -270,7 +274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -311,7 +315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -347,7 +351,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -460,12 +464,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -473,8 +484,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -493,19 +504,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -520,7 +528,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GOMA_TMP_DIR": "[CLEANUP]/goma",
@@ -539,7 +547,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -549,9 +557,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -574,7 +582,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -582,7 +590,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -592,7 +600,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"test\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
diff --git a/recipe_modules/goma/tests/full.expected/win.json b/recipe_modules/goma/tests/full.expected/win.json
index a2601a2..161463f 100644
--- a/recipe_modules/goma/tests/full.expected/win.json
+++ b/recipe_modules/goma/tests/full.expected/win.json
@@ -39,12 +39,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -52,8 +59,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -69,19 +76,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -96,7 +100,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -112,7 +116,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -122,9 +126,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -144,7 +148,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -152,7 +156,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -162,7 +166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -202,7 +206,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -232,7 +236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -257,7 +261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
diff --git a/recipe_modules/gsutil/tests/full.expected/basic.json b/recipe_modules/gsutil/tests/full.expected/basic.json
index bce7a1c..1913c90 100644
--- a/recipe_modules/gsutil/tests/full.expected/basic.json
+++ b/recipe_modules/gsutil/tests/full.expected/basic.json
@@ -13,7 +13,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3A2%405.19"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3"
     ],
     "infra_step": true,
     "luci_context": {
@@ -38,7 +38,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3A2%405.19",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3",
       "-ensure-file",
       "infra/3pp/tools/gsutil/${platform} version:2@5.19",
       "-max-threads",
@@ -77,7 +77,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3A2%405.19/gsutil",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3/gsutil",
       "-h",
       "Cache-Control:no-cache",
       "-h",
@@ -117,7 +117,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3A2%405.19/gsutil",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:23.000000Z",
       "-o",
@@ -151,7 +151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3A2%405.19/gsutil",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:24.500000Z",
       "-o",
@@ -185,7 +185,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3A2%405.19/gsutil",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3/gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:26.000000Z",
       "-o",
@@ -215,7 +215,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3A2%405.19/gsutil",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -243,7 +243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/version%3A2%405.19/gsutil",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gsutil/b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3/gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
diff --git a/recipe_modules/gsutil/tests/full.expected/retry_on_failure.json b/recipe_modules/gsutil/tests/full.expected/retry_on_failure.json
index 2561207..23fef56 100644
--- a/recipe_modules/gsutil/tests/full.expected/retry_on_failure.json
+++ b/recipe_modules/gsutil/tests/full.expected/retry_on_failure.json
@@ -13,7 +13,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\version%3A2%405.19"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3"
     ],
     "infra_step": true,
     "luci_context": {
@@ -38,7 +38,7 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\version%3A2%405.19",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3",
       "-ensure-file",
       "infra/3pp/tools/gsutil/${platform} version:2@5.19",
       "-max-threads",
@@ -77,7 +77,14 @@
   },
   {
     "cmd": [],
-    "name": "ensure cpython3"
+    "name": "ensure infra/3pp/tools/cpython3/${platform}"
+  },
+  {
+    "cmd": [],
+    "name": "ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
@@ -87,8 +94,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "infra_step": true,
     "luci_context": {
@@ -103,19 +110,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure cpython3.read manifest",
+    "name": "ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "ensure cpython3.install path/to/cpython3",
+    "name": "ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -130,7 +134,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "infra_step": true,
     "luci_context": {
@@ -145,7 +149,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -155,9 +159,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -176,7 +180,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -184,7 +188,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -194,8 +198,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
-      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\version%3A2%405.19\\gsutil",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3\\gsutil",
       "-h",
       "Cache-Control:no-cache",
       "-h",
@@ -235,8 +239,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
-      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\version%3A2%405.19\\gsutil",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3\\gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:23.000000Z",
       "-o",
@@ -270,8 +274,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
-      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\version%3A2%405.19\\gsutil",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3\\gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:24.500000Z",
       "-o",
@@ -305,8 +309,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
-      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\version%3A2%405.19\\gsutil",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3\\gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:24.500000Z",
       "-o",
@@ -340,8 +344,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
-      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\version%3A2%405.19\\gsutil",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3\\gsutil",
       "-h",
       "Custom-Time:2012-05-14T12:53:26.000000Z",
       "-o",
@@ -371,8 +375,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
-      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\version%3A2%405.19\\gsutil",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3\\gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
@@ -400,8 +404,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
-      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\version%3A2%405.19\\gsutil",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\gsutil\\b4b219a8941171148883e671bbc50247a15c06d7bae1e2ad831ef38fbb8831f3\\gsutil",
       "-o",
       "GSUtil:software_update_check_period=0",
       "cp",
diff --git a/recipe_modules/rbe/tests/full.expected/basic.json b/recipe_modules/rbe/tests/full.expected/basic.json
index 0926d0d..ea63f79 100644
--- a/recipe_modules/rbe/tests/full.expected/basic.json
+++ b/recipe_modules/rbe/tests/full.expected/basic.json
@@ -530,7 +530,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411"
     ],
     "infra_step": true,
     "luci_context": {
@@ -555,7 +555,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411",
       "-ensure-file",
       "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
       "-max-threads",
@@ -625,8 +625,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/reproxy",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
+      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/reproxy",
       "--cfg=[CLEANUP]/configs"
     ],
     "env": {
@@ -704,7 +704,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
       "--shutdown",
       "--cfg=[CLEANUP]/configs"
     ],
diff --git a/recipe_modules/rbe/tests/full.expected/read_log_proto_failure_does_not_block.json b/recipe_modules/rbe/tests/full.expected/read_log_proto_failure_does_not_block.json
index 0926d0d..ea63f79 100644
--- a/recipe_modules/rbe/tests/full.expected/read_log_proto_failure_does_not_block.json
+++ b/recipe_modules/rbe/tests/full.expected/read_log_proto_failure_does_not_block.json
@@ -530,7 +530,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411"
     ],
     "infra_step": true,
     "luci_context": {
@@ -555,7 +555,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411",
       "-ensure-file",
       "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
       "-max-threads",
@@ -625,8 +625,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/reproxy",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
+      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/reproxy",
       "--cfg=[CLEANUP]/configs"
     ],
     "env": {
@@ -704,7 +704,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
       "--shutdown",
       "--cfg=[CLEANUP]/configs"
     ],
diff --git a/recipe_modules/recipe_testing/tests/full.expected/excluded.json b/recipe_modules/recipe_testing/tests/full.expected/excluded.json
index 9f89a34..58366be 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/excluded.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/excluded.json
@@ -48,10 +48,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -66,40 +67,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogewogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IHsKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgfQogICAgfQoKICAgIGNvbmZpZ19ncm91cHM6IHsKICAgICAgZ2Vycml0OiB7CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiB7CiAgICAgICAgICBuYW1lOiAiY29iYWx0IgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CgogICAgICB2ZXJpZmllcnM6IHsKICAgICAgICBnZXJyaXRfY3FfYWJpbGl0eTogewogICAgICAgICAgY29tbWl0dGVyX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtY29tbWl0dGVycyIKICAgICAgICAgIGRyeV9ydW5fYWNjZXNzX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtdHJ5am9iLWFjY2VzcyIKICAgICAgICB9CiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29iYWx0LXg2NC1saW51eCIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KCiAgICBjb25maWdfZ3JvdXBzOiB7CiAgICAgIGdlcnJpdDogewogICAgICAgIHVybDogImh0dHBzOi8vZnVjaHNpYS1yZXZpZXcuZ29vZ2xlc291cmNlLmNvbSIKICAgICAgICBwcm9qZWN0czogewogICAgICAgICAgbmFtZTogImRvY3MiCiAgICAgICAgICByZWZfcmVnZXhwOiAicmVmcy9oZWFkcy8uKyIKICAgICAgICB9CiAgICAgIH0KCiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cnlqb2I6IHsKICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9kb2MtY2hlY2tlciIKICAgICAgICAgICAgZXhwZXJpbWVudF9wZXJjZW50YWdlOiAxMDAKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9zZWNyZXQtdHJ5am9iIgogICAgICAgICAgICByZXN1bHRfdmlzaWJpbGl0eTogQ09NTUVOVF9MRVZFTF9SRVNUUklDVEVECiAgICAgICAgICB9CiAgICAgICAgfQogICAgICB9CiAgICB9CgogICAgY29uZmlnX2dyb3VwczogewogICAgICBnZXJyaXQ6IHsKICAgICAgICB1cmw6ICJodHRwczovL2Z1Y2hzaWEtcmV2aWV3Lmdvb2dsZXNvdXJjZS5jb20iCiAgICAgICAgcHJvamVjdHM6IHsKICAgICAgICAgIG5hbWU6ICJmdWNoc2lhIgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cmVlX3N0YXR1czogewogICAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXN0ZW0tc3RhdHVzLmFwcHNwb3QuY29tIgogICAgICAgIH0KCiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29yZS5hcm02NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9jb3JlLng2NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KICAgIA==\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
diff --git a/recipe_modules/recipe_testing/tests/full.expected/fuchsia_recipe_unaffected.json b/recipe_modules/recipe_testing/tests/full.expected/fuchsia_recipe_unaffected.json
index b59ba17..a87fc99 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/fuchsia_recipe_unaffected.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/fuchsia_recipe_unaffected.json
@@ -48,10 +48,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -66,40 +67,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogewogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IHsKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgfQogICAgfQoKICAgIGNvbmZpZ19ncm91cHM6IHsKICAgICAgZ2Vycml0OiB7CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiB7CiAgICAgICAgICBuYW1lOiAiY29iYWx0IgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CgogICAgICB2ZXJpZmllcnM6IHsKICAgICAgICBnZXJyaXRfY3FfYWJpbGl0eTogewogICAgICAgICAgY29tbWl0dGVyX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtY29tbWl0dGVycyIKICAgICAgICAgIGRyeV9ydW5fYWNjZXNzX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtdHJ5am9iLWFjY2VzcyIKICAgICAgICB9CiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29iYWx0LXg2NC1saW51eCIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KCiAgICBjb25maWdfZ3JvdXBzOiB7CiAgICAgIGdlcnJpdDogewogICAgICAgIHVybDogImh0dHBzOi8vZnVjaHNpYS1yZXZpZXcuZ29vZ2xlc291cmNlLmNvbSIKICAgICAgICBwcm9qZWN0czogewogICAgICAgICAgbmFtZTogImRvY3MiCiAgICAgICAgICByZWZfcmVnZXhwOiAicmVmcy9oZWFkcy8uKyIKICAgICAgICB9CiAgICAgIH0KCiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cnlqb2I6IHsKICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9kb2MtY2hlY2tlciIKICAgICAgICAgICAgZXhwZXJpbWVudF9wZXJjZW50YWdlOiAxMDAKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9zZWNyZXQtdHJ5am9iIgogICAgICAgICAgICByZXN1bHRfdmlzaWJpbGl0eTogQ09NTUVOVF9MRVZFTF9SRVNUUklDVEVECiAgICAgICAgICB9CiAgICAgICAgfQogICAgICB9CiAgICB9CgogICAgY29uZmlnX2dyb3VwczogewogICAgICBnZXJyaXQ6IHsKICAgICAgICB1cmw6ICJodHRwczovL2Z1Y2hzaWEtcmV2aWV3Lmdvb2dsZXNvdXJjZS5jb20iCiAgICAgICAgcHJvamVjdHM6IHsKICAgICAgICAgIG5hbWU6ICJmdWNoc2lhIgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cmVlX3N0YXR1czogewogICAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXN0ZW0tc3RhdHVzLmFwcHNwb3QuY29tIgogICAgICAgIH0KCiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29yZS5hcm02NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9jb3JlLng2NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KICAgIA==\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
diff --git a/recipe_modules/recipe_testing/tests/full.expected/no_build_old_build_ignored_build.json b/recipe_modules/recipe_testing/tests/full.expected/no_build_old_build_ignored_build.json
index 0153f44..db01fa8 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/no_build_old_build_ignored_build.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/no_build_old_build_ignored_build.json
@@ -48,10 +48,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -66,40 +67,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogewogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IHsKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgfQogICAgfQoKICAgIGNvbmZpZ19ncm91cHM6IHsKICAgICAgZ2Vycml0OiB7CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiB7CiAgICAgICAgICBuYW1lOiAiY29iYWx0IgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CgogICAgICB2ZXJpZmllcnM6IHsKICAgICAgICBnZXJyaXRfY3FfYWJpbGl0eTogewogICAgICAgICAgY29tbWl0dGVyX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtY29tbWl0dGVycyIKICAgICAgICAgIGRyeV9ydW5fYWNjZXNzX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtdHJ5am9iLWFjY2VzcyIKICAgICAgICB9CiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29iYWx0LXg2NC1saW51eCIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KCiAgICBjb25maWdfZ3JvdXBzOiB7CiAgICAgIGdlcnJpdDogewogICAgICAgIHVybDogImh0dHBzOi8vZnVjaHNpYS1yZXZpZXcuZ29vZ2xlc291cmNlLmNvbSIKICAgICAgICBwcm9qZWN0czogewogICAgICAgICAgbmFtZTogImRvY3MiCiAgICAgICAgICByZWZfcmVnZXhwOiAicmVmcy9oZWFkcy8uKyIKICAgICAgICB9CiAgICAgIH0KCiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cnlqb2I6IHsKICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9kb2MtY2hlY2tlciIKICAgICAgICAgICAgZXhwZXJpbWVudF9wZXJjZW50YWdlOiAxMDAKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9zZWNyZXQtdHJ5am9iIgogICAgICAgICAgICByZXN1bHRfdmlzaWJpbGl0eTogQ09NTUVOVF9MRVZFTF9SRVNUUklDVEVECiAgICAgICAgICB9CiAgICAgICAgfQogICAgICB9CiAgICB9CgogICAgY29uZmlnX2dyb3VwczogewogICAgICBnZXJyaXQ6IHsKICAgICAgICB1cmw6ICJodHRwczovL2Z1Y2hzaWEtcmV2aWV3Lmdvb2dsZXNvdXJjZS5jb20iCiAgICAgICAgcHJvamVjdHM6IHsKICAgICAgICAgIG5hbWU6ICJmdWNoc2lhIgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cmVlX3N0YXR1czogewogICAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXN0ZW0tc3RhdHVzLmFwcHNwb3QuY29tIgogICAgICAgIH0KCiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29yZS5hcm02NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9jb3JlLng2NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KICAgIA==\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
diff --git a/recipe_modules/recipe_testing/tests/full.expected/no_latest_cl.json b/recipe_modules/recipe_testing/tests/full.expected/no_latest_cl.json
index 7b416d8..5b5fe68 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/no_latest_cl.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/no_latest_cl.json
@@ -48,10 +48,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -66,40 +67,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogewogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IHsKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgfQogICAgfQoKICAgIGNvbmZpZ19ncm91cHM6IHsKICAgICAgZ2Vycml0OiB7CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiB7CiAgICAgICAgICBuYW1lOiAiY29iYWx0IgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CgogICAgICB2ZXJpZmllcnM6IHsKICAgICAgICBnZXJyaXRfY3FfYWJpbGl0eTogewogICAgICAgICAgY29tbWl0dGVyX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtY29tbWl0dGVycyIKICAgICAgICAgIGRyeV9ydW5fYWNjZXNzX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtdHJ5am9iLWFjY2VzcyIKICAgICAgICB9CiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29iYWx0LXg2NC1saW51eCIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KCiAgICBjb25maWdfZ3JvdXBzOiB7CiAgICAgIGdlcnJpdDogewogICAgICAgIHVybDogImh0dHBzOi8vZnVjaHNpYS1yZXZpZXcuZ29vZ2xlc291cmNlLmNvbSIKICAgICAgICBwcm9qZWN0czogewogICAgICAgICAgbmFtZTogImRvY3MiCiAgICAgICAgICByZWZfcmVnZXhwOiAicmVmcy9oZWFkcy8uKyIKICAgICAgICB9CiAgICAgIH0KCiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cnlqb2I6IHsKICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9kb2MtY2hlY2tlciIKICAgICAgICAgICAgZXhwZXJpbWVudF9wZXJjZW50YWdlOiAxMDAKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9zZWNyZXQtdHJ5am9iIgogICAgICAgICAgICByZXN1bHRfdmlzaWJpbGl0eTogQ09NTUVOVF9MRVZFTF9SRVNUUklDVEVECiAgICAgICAgICB9CiAgICAgICAgfQogICAgICB9CiAgICB9CgogICAgY29uZmlnX2dyb3VwczogewogICAgICBnZXJyaXQ6IHsKICAgICAgICB1cmw6ICJodHRwczovL2Z1Y2hzaWEtcmV2aWV3Lmdvb2dsZXNvdXJjZS5jb20iCiAgICAgICAgcHJvamVjdHM6IHsKICAgICAgICAgIG5hbWU6ICJmdWNoc2lhIgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cmVlX3N0YXR1czogewogICAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXN0ZW0tc3RhdHVzLmFwcHNwb3QuY29tIgogICAgICAgIH0KCiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29yZS5hcm02NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9jb3JlLng2NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KICAgIA==\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
@@ -433,12 +408,19 @@
   },
   {
     "cmd": [],
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gitiles",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gitiles/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gitiles/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -446,8 +428,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gitiles]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gitiles]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[START_DIR]/recipe_path",
     "infra_step": true,
@@ -463,19 +445,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gitiles.read manifest",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gitiles/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gitiles\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@4@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gitiles/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gitiles.install path/to/gitiles",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gitiles/${platform}.install infra/tools/luci/gitiles",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -490,7 +469,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gitiles/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/luci/gitiles/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[START_DIR]/recipe_path",
     "infra_step": true,
@@ -506,7 +485,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gitiles.install path/to/gitiles.ensure package directory",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gitiles/${platform}.install infra/tools/luci/gitiles.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@"
     ]
@@ -516,9 +495,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gitiles/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gitiles/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gitiles version:pinned-version",
+      "infra/tools/luci/gitiles/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -538,7 +517,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gitiles.install path/to/gitiles.ensure_installed",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gitiles/${platform}.install infra/tools/luci/gitiles.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -546,7 +525,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gitiles\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gitiles/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -556,7 +535,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gitiles/version%3Apinned-version/gitiles",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gitiles/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gitiles",
       "log",
       "-json-output",
       "/path/to/tmp/json",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/recipe_proto.json b/recipe_modules/recipe_testing/tests/full.expected/recipe_proto.json
index ed15988..1c9d495 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/recipe_proto.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/recipe_proto.json
@@ -48,10 +48,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -66,40 +67,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogewogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IHsKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgfQogICAgfQoKICAgIGNvbmZpZ19ncm91cHM6IHsKICAgICAgZ2Vycml0OiB7CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiB7CiAgICAgICAgICBuYW1lOiAiY29iYWx0IgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CgogICAgICB2ZXJpZmllcnM6IHsKICAgICAgICBnZXJyaXRfY3FfYWJpbGl0eTogewogICAgICAgICAgY29tbWl0dGVyX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtY29tbWl0dGVycyIKICAgICAgICAgIGRyeV9ydW5fYWNjZXNzX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtdHJ5am9iLWFjY2VzcyIKICAgICAgICB9CiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29iYWx0LXg2NC1saW51eCIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KCiAgICBjb25maWdfZ3JvdXBzOiB7CiAgICAgIGdlcnJpdDogewogICAgICAgIHVybDogImh0dHBzOi8vZnVjaHNpYS1yZXZpZXcuZ29vZ2xlc291cmNlLmNvbSIKICAgICAgICBwcm9qZWN0czogewogICAgICAgICAgbmFtZTogImRvY3MiCiAgICAgICAgICByZWZfcmVnZXhwOiAicmVmcy9oZWFkcy8uKyIKICAgICAgICB9CiAgICAgIH0KCiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cnlqb2I6IHsKICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9kb2MtY2hlY2tlciIKICAgICAgICAgICAgZXhwZXJpbWVudF9wZXJjZW50YWdlOiAxMDAKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9zZWNyZXQtdHJ5am9iIgogICAgICAgICAgICByZXN1bHRfdmlzaWJpbGl0eTogQ09NTUVOVF9MRVZFTF9SRVNUUklDVEVECiAgICAgICAgICB9CiAgICAgICAgfQogICAgICB9CiAgICB9CgogICAgY29uZmlnX2dyb3VwczogewogICAgICBnZXJyaXQ6IHsKICAgICAgICB1cmw6ICJodHRwczovL2Z1Y2hzaWEtcmV2aWV3Lmdvb2dsZXNvdXJjZS5jb20iCiAgICAgICAgcHJvamVjdHM6IHsKICAgICAgICAgIG5hbWU6ICJmdWNoc2lhIgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cmVlX3N0YXR1czogewogICAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXN0ZW0tc3RhdHVzLmFwcHNwb3QuY29tIgogICAgICAgIH0KCiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29yZS5hcm02NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9jb3JlLng2NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KICAgIA==\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
diff --git a/recipe_modules/recipe_testing/tests/full.expected/recipes.json b/recipe_modules/recipe_testing/tests/full.expected/recipes.json
index e02dd85..c947ed2 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/recipes.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/recipes.json
@@ -48,10 +48,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -66,40 +67,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogewogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IHsKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgfQogICAgfQoKICAgIGNvbmZpZ19ncm91cHM6IHsKICAgICAgZ2Vycml0OiB7CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiB7CiAgICAgICAgICBuYW1lOiAiY29iYWx0IgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CgogICAgICB2ZXJpZmllcnM6IHsKICAgICAgICBnZXJyaXRfY3FfYWJpbGl0eTogewogICAgICAgICAgY29tbWl0dGVyX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtY29tbWl0dGVycyIKICAgICAgICAgIGRyeV9ydW5fYWNjZXNzX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtdHJ5am9iLWFjY2VzcyIKICAgICAgICB9CiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvcmVjaXBlcyIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KICAgIA==\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
diff --git a/recipe_modules/recipe_testing/tests/full.expected/recipes_cfg.json b/recipe_modules/recipe_testing/tests/full.expected/recipes_cfg.json
index 3f1af33..4a3fdb6 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/recipes_cfg.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/recipes_cfg.json
@@ -48,10 +48,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -66,40 +67,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogewogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IHsKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgfQogICAgfQoKICAgIGNvbmZpZ19ncm91cHM6IHsKICAgICAgZ2Vycml0OiB7CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiB7CiAgICAgICAgICBuYW1lOiAiZnVjaHNpYSIKICAgICAgICAgIHJlZl9yZWdleHA6ICJyZWZzL2hlYWRzLy4rIgogICAgICAgIH0KICAgICAgfQogICAgICB2ZXJpZmllcnM6IHsKICAgICAgICBnZXJyaXRfY3FfYWJpbGl0eTogewogICAgICAgICAgY29tbWl0dGVyX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtY29tbWl0dGVycyIKICAgICAgICAgIGRyeV9ydW5fYWNjZXNzX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtdHJ5am9iLWFjY2VzcyIKICAgICAgICB9CiAgICAgICAgdHJlZV9zdGF0dXM6IHsKICAgICAgICAgIHVybDogImh0dHBzOi8vZnVjaHNpYS1zdGVtLXN0YXR1cy5hcHBzcG90LmNvbSIKICAgICAgICB9CiAgICAgIH0KICAgIH0KICAgIA==\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
diff --git a/recipe_modules/recipe_testing/tests/full.expected/recipes_with_buildbucket.json b/recipe_modules/recipe_testing/tests/full.expected/recipes_with_buildbucket.json
index 64cf735..dc11aac 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/recipes_with_buildbucket.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/recipes_with_buildbucket.json
@@ -48,10 +48,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -66,40 +67,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogewogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IHsKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgfQogICAgfQoKICAgIGNvbmZpZ19ncm91cHM6IHsKICAgICAgZ2Vycml0OiB7CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiB7CiAgICAgICAgICBuYW1lOiAiY29iYWx0IgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CgogICAgICB2ZXJpZmllcnM6IHsKICAgICAgICBnZXJyaXRfY3FfYWJpbGl0eTogewogICAgICAgICAgY29tbWl0dGVyX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtY29tbWl0dGVycyIKICAgICAgICAgIGRyeV9ydW5fYWNjZXNzX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtdHJ5am9iLWFjY2VzcyIKICAgICAgICB9CiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvcmVjaXBlcyIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KICAgIA==\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
diff --git a/recipe_modules/recipe_testing/tests/full.expected/recursive_ls.json b/recipe_modules/recipe_testing/tests/full.expected/recursive_ls.json
index 7223cea..d28fe3f 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/recursive_ls.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/recursive_ls.json
@@ -48,10 +48,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -66,40 +67,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogewogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IHsKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgfQogICAgfQoKICAgIGNvbmZpZ19ncm91cHM6IHsKICAgICAgZ2Vycml0OiB7CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiB7CiAgICAgICAgICBuYW1lOiAiZnVjaHNpYSIKICAgICAgICAgIHJlZl9yZWdleHA6ICJyZWZzL2hlYWRzLy4rIgogICAgICAgIH0KICAgICAgfQogICAgICB2ZXJpZmllcnM6IHsKICAgICAgICBnZXJyaXRfY3FfYWJpbGl0eTogewogICAgICAgICAgY29tbWl0dGVyX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtY29tbWl0dGVycyIKICAgICAgICAgIGRyeV9ydW5fYWNjZXNzX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtdHJ5am9iLWFjY2VzcyIKICAgICAgICB9CiAgICAgICAgdHJlZV9zdGF0dXM6IHsKICAgICAgICAgIHVybDogImh0dHBzOi8vZnVjaHNpYS1zdGVtLXN0YXR1cy5hcHBzcG90LmNvbSIKICAgICAgICB9CiAgICAgIH0KICAgIH0KICAgIA==\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
diff --git a/recipe_modules/recipe_testing/tests/full.expected/two_pass_one_skip.json b/recipe_modules/recipe_testing/tests/full.expected/two_pass_one_skip.json
index 2c21af8..3840e31 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/two_pass_one_skip.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/two_pass_one_skip.json
@@ -48,10 +48,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -66,40 +67,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogewogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IHsKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgfQogICAgfQoKICAgIGNvbmZpZ19ncm91cHM6IHsKICAgICAgZ2Vycml0OiB7CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiB7CiAgICAgICAgICBuYW1lOiAiY29iYWx0IgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CgogICAgICB2ZXJpZmllcnM6IHsKICAgICAgICBnZXJyaXRfY3FfYWJpbGl0eTogewogICAgICAgICAgY29tbWl0dGVyX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtY29tbWl0dGVycyIKICAgICAgICAgIGRyeV9ydW5fYWNjZXNzX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtdHJ5am9iLWFjY2VzcyIKICAgICAgICB9CiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29iYWx0LXg2NC1saW51eCIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KCiAgICBjb25maWdfZ3JvdXBzOiB7CiAgICAgIGdlcnJpdDogewogICAgICAgIHVybDogImh0dHBzOi8vZnVjaHNpYS1yZXZpZXcuZ29vZ2xlc291cmNlLmNvbSIKICAgICAgICBwcm9qZWN0czogewogICAgICAgICAgbmFtZTogImRvY3MiCiAgICAgICAgICByZWZfcmVnZXhwOiAicmVmcy9oZWFkcy8uKyIKICAgICAgICB9CiAgICAgIH0KCiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cnlqb2I6IHsKICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9kb2MtY2hlY2tlciIKICAgICAgICAgICAgZXhwZXJpbWVudF9wZXJjZW50YWdlOiAxMDAKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9zZWNyZXQtdHJ5am9iIgogICAgICAgICAgICByZXN1bHRfdmlzaWJpbGl0eTogQ09NTUVOVF9MRVZFTF9SRVNUUklDVEVECiAgICAgICAgICB9CiAgICAgICAgfQogICAgICB9CiAgICB9CgogICAgY29uZmlnX2dyb3VwczogewogICAgICBnZXJyaXQ6IHsKICAgICAgICB1cmw6ICJodHRwczovL2Z1Y2hzaWEtcmV2aWV3Lmdvb2dsZXNvdXJjZS5jb20iCiAgICAgICAgcHJvamVjdHM6IHsKICAgICAgICAgIG5hbWU6ICJmdWNoc2lhIgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cmVlX3N0YXR1czogewogICAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXN0ZW0tc3RhdHVzLmFwcHNwb3QuY29tIgogICAgICAgIH0KCiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29yZS5hcm02NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9jb3JlLng2NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KICAgIA==\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
@@ -437,12 +412,19 @@
   },
   {
     "cmd": [],
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gitiles",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gitiles/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gitiles/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -450,8 +432,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gitiles]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gitiles]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[START_DIR]/recipe_path",
     "infra_step": true,
@@ -467,19 +449,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gitiles.read manifest",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gitiles/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gitiles\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@4@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gitiles/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gitiles.install path/to/gitiles",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gitiles/${platform}.install infra/tools/luci/gitiles",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -494,7 +473,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gitiles/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/luci/gitiles/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[START_DIR]/recipe_path",
     "infra_step": true,
@@ -510,7 +489,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gitiles.install path/to/gitiles.ensure package directory",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gitiles/${platform}.install infra/tools/luci/gitiles.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@"
     ]
@@ -520,9 +499,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gitiles/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gitiles/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gitiles version:pinned-version",
+      "infra/tools/luci/gitiles/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -542,7 +521,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gitiles.install path/to/gitiles.ensure_installed",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gitiles/${platform}.install infra/tools/luci/gitiles.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -550,7 +529,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gitiles\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gitiles/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -560,7 +539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gitiles/version%3Apinned-version/gitiles",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gitiles/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gitiles",
       "log",
       "-json-output",
       "/path/to/tmp/json",
@@ -622,12 +601,19 @@
   },
   {
     "cmd": [],
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gerrit",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gerrit/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gerrit/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -635,8 +621,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[START_DIR]/recipe_path",
     "infra_step": true,
@@ -652,19 +638,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gerrit.read manifest",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gerrit\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@4@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gerrit.install path/to/gerrit",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -679,7 +662,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[START_DIR]/recipe_path",
     "infra_step": true,
@@ -695,7 +678,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gerrit.install path/to/gerrit.ensure package directory",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@"
     ]
@@ -705,9 +688,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gerrit version:pinned-version",
+      "infra/tools/luci/gerrit/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -727,7 +710,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "get builders.fuchsia/try/core.arm64-debug.ensure gerrit.install path/to/gerrit.ensure_installed",
+    "name": "get builders.fuchsia/try/core.arm64-debug.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -735,7 +718,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gerrit\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -745,7 +728,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-detail",
       "-host",
       "https://flutter-review.googlesource.com",
diff --git a/recipe_modules/recipe_testing/tests/full.expected/with_buildbucket.json b/recipe_modules/recipe_testing/tests/full.expected/with_buildbucket.json
index f9f8eff..e1fbffb 100644
--- a/recipe_modules/recipe_testing/tests/full.expected/with_buildbucket.json
+++ b/recipe_modules/recipe_testing/tests/full.expected/with_buildbucket.json
@@ -48,10 +48,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -66,40 +67,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:ci"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogewogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IHsKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgfQogICAgfQoKICAgIGNvbmZpZ19ncm91cHM6IHsKICAgICAgZ2Vycml0OiB7CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiB7CiAgICAgICAgICBuYW1lOiAiY29iYWx0IgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CgogICAgICB2ZXJpZmllcnM6IHsKICAgICAgICBnZXJyaXRfY3FfYWJpbGl0eTogewogICAgICAgICAgY29tbWl0dGVyX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtY29tbWl0dGVycyIKICAgICAgICAgIGRyeV9ydW5fYWNjZXNzX2xpc3Q6ICJwcm9qZWN0LWZ1Y2hzaWEtdHJ5am9iLWFjY2VzcyIKICAgICAgICB9CiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29iYWx0LXg2NC1saW51eCIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KCiAgICBjb25maWdfZ3JvdXBzOiB7CiAgICAgIGdlcnJpdDogewogICAgICAgIHVybDogImh0dHBzOi8vZnVjaHNpYS1yZXZpZXcuZ29vZ2xlc291cmNlLmNvbSIKICAgICAgICBwcm9qZWN0czogewogICAgICAgICAgbmFtZTogImRvY3MiCiAgICAgICAgICByZWZfcmVnZXhwOiAicmVmcy9oZWFkcy8uKyIKICAgICAgICB9CiAgICAgIH0KCiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cnlqb2I6IHsKICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9kb2MtY2hlY2tlciIKICAgICAgICAgICAgZXhwZXJpbWVudF9wZXJjZW50YWdlOiAxMDAKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9zZWNyZXQtdHJ5am9iIgogICAgICAgICAgICByZXN1bHRfdmlzaWJpbGl0eTogQ09NTUVOVF9MRVZFTF9SRVNUUklDVEVECiAgICAgICAgICB9CiAgICAgICAgfQogICAgICB9CiAgICB9CgogICAgY29uZmlnX2dyb3VwczogewogICAgICBnZXJyaXQ6IHsKICAgICAgICB1cmw6ICJodHRwczovL2Z1Y2hzaWEtcmV2aWV3Lmdvb2dsZXNvdXJjZS5jb20iCiAgICAgICAgcHJvamVjdHM6IHsKICAgICAgICAgIG5hbWU6ICJmdWNoc2lhIgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgfQogICAgICB9CiAgICAgIHZlcmlmaWVyczogewogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiB7CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZnVjaHNpYS1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZnVjaHNpYS10cnlqb2ItYWNjZXNzIgogICAgICAgIH0KICAgICAgICB0cmVlX3N0YXR1czogewogICAgICAgICAgdXJsOiAiaHR0cHM6Ly9mdWNoc2lhLXN0ZW0tc3RhdHVzLmFwcHNwb3QuY29tIgogICAgICAgIH0KCiAgICAgICAgdHJ5am9iOiB7CiAgICAgICAgICBidWlsZGVyczogewogICAgICAgICAgICBuYW1lOiAiZnVjaHNpYS90cnkvY29yZS5hcm02NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICAgIGJ1aWxkZXJzOiB7CiAgICAgICAgICAgIG5hbWU6ICJmdWNoc2lhL3RyeS9jb3JlLng2NC1kZWJ1ZyIKICAgICAgICAgIH0KICAgICAgICB9CiAgICAgIH0KICAgIH0KICAgIA==\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
diff --git a/recipe_modules/shard_util_v2/examples/full.expected/monorepo_bb_subbuilds.json b/recipe_modules/shard_util_v2/examples/full.expected/monorepo_bb_subbuilds.json
index ca817f0..b93815d 100644
--- a/recipe_modules/shard_util_v2/examples/full.expected/monorepo_bb_subbuilds.json
+++ b/recipe_modules/shard_util_v2/examples/full.expected/monorepo_bb_subbuilds.json
@@ -356,7 +356,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -381,7 +381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -420,7 +420,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -453,7 +453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipe_modules/shard_util_v2/examples/full.expected/monorepo_led_subbuilds.json b/recipe_modules/shard_util_v2/examples/full.expected/monorepo_led_subbuilds.json
index fb8f616..36ac807 100644
--- a/recipe_modules/shard_util_v2/examples/full.expected/monorepo_led_subbuilds.json
+++ b/recipe_modules/shard_util_v2/examples/full.expected/monorepo_led_subbuilds.json
@@ -976,7 +976,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1001,7 +1001,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1040,7 +1040,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -1073,7 +1073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipe_modules/shard_util_v2/examples/full.expected/monorepo_try_bb_subbuilds.json b/recipe_modules/shard_util_v2/examples/full.expected/monorepo_try_bb_subbuilds.json
index dc46ec3..f5eccbe 100644
--- a/recipe_modules/shard_util_v2/examples/full.expected/monorepo_try_bb_subbuilds.json
+++ b/recipe_modules/shard_util_v2/examples/full.expected/monorepo_try_bb_subbuilds.json
@@ -371,7 +371,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -396,7 +396,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -435,7 +435,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -468,7 +468,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipe_modules/shard_util_v2/examples/full.expected/monorepo_try_led_subbuilds.json b/recipe_modules/shard_util_v2/examples/full.expected/monorepo_try_led_subbuilds.json
index 2e20ee1..dc902e0 100644
--- a/recipe_modules/shard_util_v2/examples/full.expected/monorepo_try_led_subbuilds.json
+++ b/recipe_modules/shard_util_v2/examples/full.expected/monorepo_try_led_subbuilds.json
@@ -1094,7 +1094,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1119,7 +1119,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1158,7 +1158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -1191,7 +1191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipe_modules/shard_util_v2/examples/full.expected/presubmit_bb.json b/recipe_modules/shard_util_v2/examples/full.expected/presubmit_bb.json
index a76de6e..be08c67 100644
--- a/recipe_modules/shard_util_v2/examples/full.expected/presubmit_bb.json
+++ b/recipe_modules/shard_util_v2/examples/full.expected/presubmit_bb.json
@@ -299,7 +299,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin"
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227"
     ],
     "infra_step": true,
     "luci_context": {
@@ -324,7 +324,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227",
       "-ensure-file",
       "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
@@ -363,7 +363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin/swarming",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227/swarming",
       "collect",
       "-server",
       "https://example.swarmingserver.appspot.com",
diff --git a/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led.json b/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led.json
index 76bc921..9b4c32b 100644
--- a/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led.json
+++ b/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led.json
@@ -976,7 +976,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1001,7 +1001,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1040,7 +1040,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -1073,7 +1073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led_subbuilds.json b/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led_subbuilds.json
index e957ecc..d65007a 100644
--- a/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led_subbuilds.json
+++ b/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led_subbuilds.json
@@ -976,7 +976,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1001,7 +1001,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1040,7 +1040,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -1073,7 +1073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipe_modules/subbuild/tests/full.expected/failed_subbuild.json b/recipe_modules/subbuild/tests/full.expected/failed_subbuild.json
index 67bef1c..0edce77 100644
--- a/recipe_modules/subbuild/tests/full.expected/failed_subbuild.json
+++ b/recipe_modules/subbuild/tests/full.expected/failed_subbuild.json
@@ -372,7 +372,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin"
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227"
     ],
     "infra_step": true,
     "luci_context": {
@@ -397,7 +397,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227",
       "-ensure-file",
       "infra/tools/luci/swarming/${platform} swarming_module_pin",
       "-max-threads",
@@ -436,7 +436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/swarming_module_pin/swarming",
+      "[START_DIR]/cipd_tool/infra/tools/luci/swarming/90026cfdbec6795a35e48e95f30cbb0f779e0a4c35016adb14707e333aee4227/swarming",
       "collect",
       "-server",
       "https://example.swarmingserver.appspot.com",
diff --git a/recipe_modules/tar/tests/full.expected/linux.json b/recipe_modules/tar/tests/full.expected/linux.json
index 7421198..035e370 100644
--- a/recipe_modules/tar/tests/full.expected/linux.json
+++ b/recipe_modules/tar/tests/full.expected/linux.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/git_revision%3A6462ccda48c8f33dce4c80c2f1533263277d4da9"
+      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/52b14bf3d8a0f805133bcb8677059decc65268e139074f6d4f2fccb11fe0e174"
     ],
     "infra_step": true,
     "name": "install fuchsia/tools/bsdtar.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/git_revision%3A6462ccda48c8f33dce4c80c2f1533263277d4da9",
+      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/52b14bf3d8a0f805133bcb8677059decc65268e139074f6d4f2fccb11fe0e174",
       "-ensure-file",
       "fuchsia/tools/bsdtar/${platform} git_revision:6462ccda48c8f33dce4c80c2f1533263277d4da9",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/git_revision%3A6462ccda48c8f33dce4c80c2f1533263277d4da9/bsdtar",
+      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/52b14bf3d8a0f805133bcb8677059decc65268e139074f6d4f2fccb11fe0e174/bsdtar",
       "--create",
       "-f",
       "[CLEANUP]/tar-example_tmp_1/more.tar.gz",
@@ -113,7 +113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/git_revision%3A6462ccda48c8f33dce4c80c2f1533263277d4da9/bsdtar",
+      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/52b14bf3d8a0f805133bcb8677059decc65268e139074f6d4f2fccb11fe0e174/bsdtar",
       "--extract",
       "--verbose",
       "-f",
diff --git a/recipe_modules/tar/tests/full.expected/mac.json b/recipe_modules/tar/tests/full.expected/mac.json
index 7421198..035e370 100644
--- a/recipe_modules/tar/tests/full.expected/mac.json
+++ b/recipe_modules/tar/tests/full.expected/mac.json
@@ -49,7 +49,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/git_revision%3A6462ccda48c8f33dce4c80c2f1533263277d4da9"
+      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/52b14bf3d8a0f805133bcb8677059decc65268e139074f6d4f2fccb11fe0e174"
     ],
     "infra_step": true,
     "name": "install fuchsia/tools/bsdtar.ensure package directory",
@@ -62,7 +62,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/git_revision%3A6462ccda48c8f33dce4c80c2f1533263277d4da9",
+      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/52b14bf3d8a0f805133bcb8677059decc65268e139074f6d4f2fccb11fe0e174",
       "-ensure-file",
       "fuchsia/tools/bsdtar/${platform} git_revision:6462ccda48c8f33dce4c80c2f1533263277d4da9",
       "-max-threads",
@@ -89,7 +89,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/git_revision%3A6462ccda48c8f33dce4c80c2f1533263277d4da9/bsdtar",
+      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/52b14bf3d8a0f805133bcb8677059decc65268e139074f6d4f2fccb11fe0e174/bsdtar",
       "--create",
       "-f",
       "[CLEANUP]/tar-example_tmp_1/more.tar.gz",
@@ -113,7 +113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/git_revision%3A6462ccda48c8f33dce4c80c2f1533263277d4da9/bsdtar",
+      "[START_DIR]/cipd_tool/fuchsia/tools/bsdtar/52b14bf3d8a0f805133bcb8677059decc65268e139074f6d4f2fccb11fe0e174/bsdtar",
       "--extract",
       "--verbose",
       "-f",
diff --git a/recipes/contrib/salt_packer.expected/try_success.json b/recipes/contrib/salt_packer.expected/try_success.json
index 7e68bde..00b48e0 100644
--- a/recipes/contrib/salt_packer.expected/try_success.json
+++ b/recipes/contrib/salt_packer.expected/try_success.json
@@ -5,12 +5,19 @@
   },
   {
     "cmd": [],
-    "name": "checkout.ensure gerrit",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -18,8 +25,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "infra_step": true,
     "luci_context": {
@@ -34,19 +41,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.ensure gerrit.read manifest",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gerrit\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "checkout.ensure gerrit.install path/to/gerrit",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -61,7 +65,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "infra_step": true,
     "luci_context": {
@@ -76,7 +80,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.ensure gerrit.install path/to/gerrit.ensure package directory",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -86,9 +90,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gerrit version:pinned-version",
+      "infra/tools/luci/gerrit/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -107,7 +111,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.ensure gerrit.install path/to/gerrit.ensure_installed",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -115,7 +119,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gerrit\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -125,7 +129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-detail",
       "-host",
       "https://dash-internal-review.googlesource.com",
diff --git a/recipes/contrib/salt_packer_base_image_roller.expected/get_latest_failure.json b/recipes/contrib/salt_packer_base_image_roller.expected/get_latest_failure.json
index 52c81e5..0e83d18 100644
--- a/recipes/contrib/salt_packer_base_image_roller.expected/get_latest_failure.json
+++ b/recipes/contrib/salt_packer_base_image_roller.expected/get_latest_failure.json
@@ -675,7 +675,14 @@
   },
   {
     "cmd": [],
-    "name": "ensure gcloud"
+    "name": "ensure infra/3pp/tools/gcloud/${platform}"
+  },
+  {
+    "cmd": [],
+    "name": "ensure infra/3pp/tools/gcloud/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
@@ -685,8 +692,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gcloud]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gcloud]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "infra_step": true,
     "luci_context": {
@@ -701,19 +708,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gcloud.read manifest",
+    "name": "ensure infra/3pp/tools/gcloud/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gcloud\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gcloud/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "ensure gcloud.install path/to/gcloud",
+    "name": "ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -728,7 +732,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "infra_step": true,
     "luci_context": {
@@ -743,7 +747,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gcloud.install path/to/gcloud.ensure package directory",
+    "name": "ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -753,9 +757,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gcloud version:pinned-version",
+      "infra/3pp/tools/gcloud/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -774,7 +778,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gcloud.install path/to/gcloud.ensure_installed",
+    "name": "ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -782,7 +786,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gcloud\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/gcloud/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -792,7 +796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/gcloud",
       "compute",
       "images",
       "describe-from-family",
diff --git a/recipes/contrib/salt_packer_base_image_roller.expected/update.json b/recipes/contrib/salt_packer_base_image_roller.expected/update.json
index 8d1410f..3e9a28b 100644
--- a/recipes/contrib/salt_packer_base_image_roller.expected/update.json
+++ b/recipes/contrib/salt_packer_base_image_roller.expected/update.json
@@ -675,7 +675,14 @@
   },
   {
     "cmd": [],
-    "name": "ensure gcloud"
+    "name": "ensure infra/3pp/tools/gcloud/${platform}"
+  },
+  {
+    "cmd": [],
+    "name": "ensure infra/3pp/tools/gcloud/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
@@ -685,8 +692,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gcloud]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gcloud]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "infra_step": true,
     "luci_context": {
@@ -701,19 +708,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gcloud.read manifest",
+    "name": "ensure infra/3pp/tools/gcloud/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gcloud\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gcloud/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "ensure gcloud.install path/to/gcloud",
+    "name": "ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -728,7 +732,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "infra_step": true,
     "luci_context": {
@@ -743,7 +747,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gcloud.install path/to/gcloud.ensure package directory",
+    "name": "ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -753,9 +757,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gcloud version:pinned-version",
+      "infra/3pp/tools/gcloud/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -774,7 +778,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gcloud.install path/to/gcloud.ensure_installed",
+    "name": "ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -782,7 +786,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gcloud\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/gcloud/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -792,7 +796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/gcloud",
       "compute",
       "images",
       "describe-from-family",
@@ -1023,7 +1027,14 @@
   },
   {
     "cmd": [],
-    "name": "ensure gerrit"
+    "name": "ensure infra/tools/luci/gerrit/${platform}"
+  },
+  {
+    "cmd": [],
+    "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
@@ -1033,8 +1044,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[START_DIR]/dash-internal-salt",
     "infra_step": true,
@@ -1050,19 +1061,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gerrit.read manifest",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gerrit\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "ensure gerrit.install path/to/gerrit",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1077,7 +1085,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[START_DIR]/dash-internal-salt",
     "infra_step": true,
@@ -1093,7 +1101,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1103,9 +1111,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gerrit version:pinned-version",
+      "infra/tools/luci/gerrit/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1125,7 +1133,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1133,7 +1141,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gerrit\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1143,7 +1151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-query",
       "-host",
       "https://dash-internal-review.googlesource.com",
@@ -1247,7 +1255,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-detail",
       "-host",
       "https://dash-internal-review.googlesource.com",
diff --git a/recipes/devicelab/devicelab_drone.expected/linux-xvfb.json b/recipes/devicelab/devicelab_drone.expected/linux-xvfb.json
index 5d058b3..d8f1a5b 100644
--- a/recipes/devicelab/devicelab_drone.expected/linux-xvfb.json
+++ b/recipes/devicelab/devicelab_drone.expected/linux-xvfb.json
@@ -1055,7 +1055,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -1102,7 +1102,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1163,7 +1163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/devicelab/devicelab_drone.expected/local-engine.json b/recipes/devicelab/devicelab_drone.expected/local-engine.json
index 23d8b84..f5f51ef 100644
--- a/recipes/devicelab/devicelab_drone.expected/local-engine.json
+++ b/recipes/devicelab/devicelab_drone.expected/local-engine.json
@@ -378,7 +378,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -403,7 +403,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -442,7 +442,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/devicelab/devicelab_drone.expected/no-upload-metrics-linux-staging.json b/recipes/devicelab/devicelab_drone.expected/no-upload-metrics-linux-staging.json
index 2fb6b9b..71623c6 100644
--- a/recipes/devicelab/devicelab_drone.expected/no-upload-metrics-linux-staging.json
+++ b/recipes/devicelab/devicelab_drone.expected/no-upload-metrics-linux-staging.json
@@ -1054,7 +1054,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -1101,7 +1101,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1162,7 +1162,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
index 6ee2bd0..3a2c657 100644
--- a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
@@ -2344,7 +2344,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -2391,7 +2391,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -2452,7 +2452,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json b/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
index 1e9a0a4..bb5ac6e 100644
--- a/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
+++ b/recipes/devicelab/devicelab_drone_build_test.expected/local-engine.json
@@ -317,7 +317,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -342,7 +342,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -381,7 +381,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/devicelab/devicelab_test_drone.expected/basic.json b/recipes/devicelab/devicelab_test_drone.expected/basic.json
index 7541f6b..208232d 100644
--- a/recipes/devicelab/devicelab_test_drone.expected/basic.json
+++ b/recipes/devicelab/devicelab_test_drone.expected/basic.json
@@ -1425,7 +1425,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -1471,7 +1471,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1531,7 +1531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/devicelab/devicelab_test_drone.expected/local-engine.json b/recipes/devicelab/devicelab_test_drone.expected/local-engine.json
index 4ef33a8..3b5299d 100644
--- a/recipes/devicelab/devicelab_test_drone.expected/local-engine.json
+++ b/recipes/devicelab/devicelab_test_drone.expected/local-engine.json
@@ -378,7 +378,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -403,7 +403,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -442,7 +442,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/devicelab/devicelab_test_drone.expected/no-upload-metrics-linux-staging.json b/recipes/devicelab/devicelab_test_drone.expected/no-upload-metrics-linux-staging.json
index 45e8ad1..ea56969 100644
--- a/recipes/devicelab/devicelab_test_drone.expected/no-upload-metrics-linux-staging.json
+++ b/recipes/devicelab/devicelab_test_drone.expected/no-upload-metrics-linux-staging.json
@@ -1069,7 +1069,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {
@@ -1115,7 +1115,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1175,7 +1175,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/Linux Fuchsia failing test.json b/recipes/engine/engine.expected/Linux Fuchsia failing test.json
index f350124..884907b 100644
--- a/recipes/engine/engine.expected/Linux Fuchsia failing test.json
+++ b/recipes/engine/engine.expected/Linux Fuchsia failing test.json
@@ -514,12 +514,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -527,8 +534,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -572,19 +579,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -599,7 +603,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -643,7 +647,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -653,9 +657,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -703,7 +707,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -711,7 +715,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -721,7 +725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -827,7 +831,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -885,7 +889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1102,12 +1106,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1115,8 +1126,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1152,19 +1163,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1179,7 +1187,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1215,7 +1223,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1225,9 +1233,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1267,7 +1275,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1275,7 +1283,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1285,7 +1293,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
diff --git a/recipes/engine/engine.expected/Linux Fuchsia skips on duplicate.json b/recipes/engine/engine.expected/Linux Fuchsia skips on duplicate.json
index 4004da8..ec00d54 100644
--- a/recipes/engine/engine.expected/Linux Fuchsia skips on duplicate.json
+++ b/recipes/engine/engine.expected/Linux Fuchsia skips on duplicate.json
@@ -1089,12 +1089,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1102,8 +1109,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1147,19 +1154,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1174,7 +1178,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1218,7 +1222,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1228,9 +1232,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1278,7 +1282,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1286,7 +1290,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1296,7 +1300,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1400,7 +1404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1511,7 +1515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1675,12 +1679,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1688,8 +1699,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1725,19 +1736,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1752,7 +1760,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1788,7 +1796,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1798,9 +1806,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1840,7 +1848,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1848,7 +1856,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1858,7 +1866,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1998,7 +2006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2102,7 +2110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2160,7 +2168,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2213,7 +2221,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2377,7 +2385,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2675,7 +2683,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2719,7 +2727,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -2777,7 +2785,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/clobber.json b/recipes/engine/engine.expected/clobber.json
index def0e4f..7f85e28 100644
--- a/recipes/engine/engine.expected/clobber.json
+++ b/recipes/engine/engine.expected/clobber.json
@@ -732,12 +732,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -745,8 +752,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -791,19 +798,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -818,7 +822,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -863,7 +867,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -873,9 +877,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -924,7 +928,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -932,7 +936,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -942,7 +946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1047,7 +1051,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1106,7 +1110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1160,7 +1164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1327,12 +1331,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1340,8 +1351,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1378,19 +1389,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1405,7 +1413,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1442,7 +1450,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1452,9 +1460,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1495,7 +1503,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1503,7 +1511,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1513,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1563,7 +1571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1674,7 +1682,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1733,7 +1741,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1787,7 +1795,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1954,7 +1962,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2160,7 +2168,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2219,7 +2227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2273,7 +2281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2440,7 +2448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2537,7 +2545,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2653,7 +2661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2712,7 +2720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2766,7 +2774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2933,7 +2941,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3182,7 +3190,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3241,7 +3249,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3295,7 +3303,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3462,7 +3470,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3605,7 +3613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3712,7 +3720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3771,7 +3779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3825,7 +3833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3992,7 +4000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4086,7 +4094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4192,7 +4200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4251,7 +4259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4305,7 +4313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4472,7 +4480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4674,7 +4682,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4733,7 +4741,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4787,7 +4795,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4954,7 +4962,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5048,7 +5056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5154,7 +5162,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5213,7 +5221,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5267,7 +5275,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5434,7 +5442,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5529,7 +5537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5634,7 +5642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5693,7 +5701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5747,7 +5755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5914,7 +5922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6774,7 +6782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6888,7 +6896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6947,7 +6955,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7001,7 +7009,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7168,7 +7176,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7475,7 +7483,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/latest"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/5e1e2bcac305958b27077ca136f35f0abae7cf38c9af678f7d220ed0cb51d4f8"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7520,7 +7528,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/latest",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/5e1e2bcac305958b27077ca136f35f0abae7cf38c9af678f7d220ed0cb51d4f8",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} latest",
       "-max-threads",
@@ -7579,7 +7587,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/latest/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/5e1e2bcac305958b27077ca136f35f0abae7cf38c9af678f7d220ed0cb51d4f8/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8644,7 +8652,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8750,7 +8758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8809,7 +8817,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8863,7 +8871,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9030,7 +9038,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9173,7 +9181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9279,7 +9287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9338,7 +9346,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9392,7 +9400,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9559,7 +9567,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/experimental.json b/recipes/engine/engine.expected/experimental.json
index c4ee1e0..11cb02a 100644
--- a/recipes/engine/engine.expected/experimental.json
+++ b/recipes/engine/engine.expected/experimental.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7389,7 +7397,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/latest"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/5e1e2bcac305958b27077ca136f35f0abae7cf38c9af678f7d220ed0cb51d4f8"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7434,7 +7442,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/latest",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/5e1e2bcac305958b27077ca136f35f0abae7cf38c9af678f7d220ed0cb51d4f8",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} latest",
       "-max-threads",
@@ -7493,7 +7501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/latest/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/5e1e2bcac305958b27077ca136f35f0abae7cf38c9af678f7d220ed0cb51d4f8/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8550,7 +8558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8656,7 +8664,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8715,7 +8723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8769,7 +8777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8936,7 +8944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9079,7 +9087,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9185,7 +9193,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9244,7 +9252,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9298,7 +9306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9465,7 +9473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/experimental_upload.json b/recipes/engine/engine.expected/experimental_upload.json
index 4c8a311..afb1f9c 100644
--- a/recipes/engine/engine.expected/experimental_upload.json
+++ b/recipes/engine/engine.expected/experimental_upload.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7389,7 +7397,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/latest"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/5e1e2bcac305958b27077ca136f35f0abae7cf38c9af678f7d220ed0cb51d4f8"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7434,7 +7442,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/latest",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/5e1e2bcac305958b27077ca136f35f0abae7cf38c9af678f7d220ed0cb51d4f8",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} latest",
       "-max-threads",
@@ -7493,7 +7501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/latest/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/5e1e2bcac305958b27077ca136f35f0abae7cf38c9af678f7d220ed0cb51d4f8/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8760,7 +8768,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8819,7 +8827,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8873,7 +8881,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9040,7 +9048,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9183,7 +9191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9289,7 +9297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9348,7 +9356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9402,7 +9410,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9569,7 +9577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/fail_android_aot_sharded_builds.json b/recipes/engine/engine.expected/fail_android_aot_sharded_builds.json
index ff057a5..5f1e0db 100644
--- a/recipes/engine/engine.expected/fail_android_aot_sharded_builds.json
+++ b/recipes/engine/engine.expected/fail_android_aot_sharded_builds.json
@@ -570,12 +570,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -583,8 +590,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -631,19 +638,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -658,7 +662,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -705,7 +709,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -715,9 +719,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -768,7 +772,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -776,7 +780,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -786,7 +790,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -898,7 +902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -959,7 +963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1015,7 +1019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1188,12 +1192,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1201,8 +1212,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1241,19 +1252,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1268,7 +1276,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1307,7 +1315,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1317,9 +1325,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1362,7 +1370,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1370,7 +1378,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1380,7 +1388,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_flutter_flutter-3.8-candidate.10.json
index 7095d16..c935fb9 100644
--- a/recipes/engine/engine.expected/linux_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_flutter_flutter-3.8-candidate.10.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8564,7 +8572,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8670,7 +8678,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8729,7 +8737,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8783,7 +8791,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8950,7 +8958,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9093,7 +9101,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9199,7 +9207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9258,7 +9266,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9312,7 +9320,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9479,7 +9487,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_flutter_main.json b/recipes/engine/engine.expected/linux_flutter_main.json
index 7095d16..c935fb9 100644
--- a/recipes/engine/engine.expected/linux_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_flutter_main.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8564,7 +8572,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8670,7 +8678,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8729,7 +8737,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8783,7 +8791,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8950,7 +8958,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9093,7 +9101,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9199,7 +9207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9258,7 +9266,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9312,7 +9320,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9479,7 +9487,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_font_subset_flutter_flutter-3.8-candidate.10.json
index 7095d16..c935fb9 100644
--- a/recipes/engine/engine.expected/linux_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8564,7 +8572,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8670,7 +8678,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8729,7 +8737,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8783,7 +8791,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8950,7 +8958,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9093,7 +9101,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9199,7 +9207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9258,7 +9266,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9312,7 +9320,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9479,7 +9487,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_font_subset_flutter_main.json b/recipes/engine/engine.expected/linux_font_subset_flutter_main.json
index 7095d16..c935fb9 100644
--- a/recipes/engine/engine.expected/linux_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_font_subset_flutter_main.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8564,7 +8572,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8670,7 +8678,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8729,7 +8737,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8783,7 +8791,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8950,7 +8958,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9093,7 +9101,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9199,7 +9207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9258,7 +9266,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9312,7 +9320,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9479,7 +9487,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_font_subset_prod_flutter-3.8-candidate.10.json
index d6d3948..478cfb2 100644
--- a/recipes/engine/engine.expected/linux_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_font_subset_prod_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8044,7 +8052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8158,7 +8166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8217,7 +8225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8271,7 +8279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8438,7 +8446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8795,7 +8803,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8840,7 +8848,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11990,7 +11998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12096,7 +12104,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12155,7 +12163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12209,7 +12217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12519,7 +12527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12625,7 +12633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12684,7 +12692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12738,7 +12746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12905,7 +12913,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_font_subset_prod_main.json b/recipes/engine/engine.expected/linux_font_subset_prod_main.json
index d7932a7..5dacc42 100644
--- a/recipes/engine/engine.expected/linux_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/linux_font_subset_prod_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8044,7 +8052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8158,7 +8166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8217,7 +8225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8271,7 +8279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8438,7 +8446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8795,7 +8803,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8840,7 +8848,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11990,7 +11998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12096,7 +12104,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12155,7 +12163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12209,7 +12217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12519,7 +12527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12625,7 +12633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12684,7 +12692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12738,7 +12746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12905,7 +12913,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_font_subset_staging_flutter-3.8-candidate.10.json
index b4d2ac5..85b8d2b 100644
--- a/recipes/engine/engine.expected/linux_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_font_subset_staging_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8600,7 +8608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8706,7 +8714,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8765,7 +8773,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8819,7 +8827,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8986,7 +8994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9129,7 +9137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9235,7 +9243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9294,7 +9302,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9348,7 +9356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9515,7 +9523,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_font_subset_staging_main.json b/recipes/engine/engine.expected/linux_font_subset_staging_main.json
index 99802cd..f4c6bb4 100644
--- a/recipes/engine/engine.expected/linux_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/linux_font_subset_staging_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8600,7 +8608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8706,7 +8714,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8765,7 +8773,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8819,7 +8827,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8986,7 +8994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9129,7 +9137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9235,7 +9243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9294,7 +9302,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9348,7 +9356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9515,7 +9523,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_maven_flutter_flutter-3.8-candidate.10.json
index 7095d16..c935fb9 100644
--- a/recipes/engine/engine.expected/linux_maven_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_maven_flutter_flutter-3.8-candidate.10.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8564,7 +8572,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8670,7 +8678,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8729,7 +8737,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8783,7 +8791,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8950,7 +8958,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9093,7 +9101,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9199,7 +9207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9258,7 +9266,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9312,7 +9320,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9479,7 +9487,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_flutter_main.json b/recipes/engine/engine.expected/linux_maven_flutter_main.json
index 7095d16..c935fb9 100644
--- a/recipes/engine/engine.expected/linux_maven_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_maven_flutter_main.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8564,7 +8572,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8670,7 +8678,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8729,7 +8737,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8783,7 +8791,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8950,7 +8958,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9093,7 +9101,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9199,7 +9207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9258,7 +9266,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9312,7 +9320,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9479,7 +9487,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_maven_font_subset_flutter_flutter-3.8-candidate.10.json
index 7095d16..c935fb9 100644
--- a/recipes/engine/engine.expected/linux_maven_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_maven_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8564,7 +8572,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8670,7 +8678,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8729,7 +8737,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8783,7 +8791,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8950,7 +8958,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9093,7 +9101,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9199,7 +9207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9258,7 +9266,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9312,7 +9320,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9479,7 +9487,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_font_subset_flutter_main.json b/recipes/engine/engine.expected/linux_maven_font_subset_flutter_main.json
index 7095d16..c935fb9 100644
--- a/recipes/engine/engine.expected/linux_maven_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_maven_font_subset_flutter_main.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8564,7 +8572,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8670,7 +8678,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8729,7 +8737,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8783,7 +8791,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8950,7 +8958,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9093,7 +9101,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9199,7 +9207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9258,7 +9266,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9312,7 +9320,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9479,7 +9487,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_maven_font_subset_prod_flutter-3.8-candidate.10.json
index d6d3948..478cfb2 100644
--- a/recipes/engine/engine.expected/linux_maven_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_maven_font_subset_prod_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8044,7 +8052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8158,7 +8166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8217,7 +8225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8271,7 +8279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8438,7 +8446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8795,7 +8803,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8840,7 +8848,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11990,7 +11998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12096,7 +12104,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12155,7 +12163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12209,7 +12217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12519,7 +12527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12625,7 +12633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12684,7 +12692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12738,7 +12746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12905,7 +12913,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_font_subset_prod_main.json b/recipes/engine/engine.expected/linux_maven_font_subset_prod_main.json
index d7932a7..5dacc42 100644
--- a/recipes/engine/engine.expected/linux_maven_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/linux_maven_font_subset_prod_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8044,7 +8052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8158,7 +8166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8217,7 +8225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8271,7 +8279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8438,7 +8446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8795,7 +8803,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8840,7 +8848,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11990,7 +11998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12096,7 +12104,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12155,7 +12163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12209,7 +12217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12519,7 +12527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12625,7 +12633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12684,7 +12692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12738,7 +12746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12905,7 +12913,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_maven_font_subset_staging_flutter-3.8-candidate.10.json
index b4d2ac5..85b8d2b 100644
--- a/recipes/engine/engine.expected/linux_maven_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_maven_font_subset_staging_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8600,7 +8608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8706,7 +8714,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8765,7 +8773,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8819,7 +8827,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8986,7 +8994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9129,7 +9137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9235,7 +9243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9294,7 +9302,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9348,7 +9356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9515,7 +9523,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_font_subset_staging_main.json b/recipes/engine/engine.expected/linux_maven_font_subset_staging_main.json
index 99802cd..f4c6bb4 100644
--- a/recipes/engine/engine.expected/linux_maven_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/linux_maven_font_subset_staging_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8600,7 +8608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8706,7 +8714,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8765,7 +8773,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8819,7 +8827,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8986,7 +8994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9129,7 +9137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9235,7 +9243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9294,7 +9302,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9348,7 +9356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9515,7 +9523,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_maven_no_lto_flutter_flutter-3.8-candidate.10.json
index d3d3467..cb15b43 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8569,7 +8577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8675,7 +8683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8734,7 +8742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8788,7 +8796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8955,7 +8963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9098,7 +9106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9204,7 +9212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9263,7 +9271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9317,7 +9325,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9484,7 +9492,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_flutter_main.json b/recipes/engine/engine.expected/linux_maven_no_lto_flutter_main.json
index d3d3467..cb15b43 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_flutter_main.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8569,7 +8577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8675,7 +8683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8734,7 +8742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8788,7 +8796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8955,7 +8963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9098,7 +9106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9204,7 +9212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9263,7 +9271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9317,7 +9325,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9484,7 +9492,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index d3d3467..cb15b43 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8569,7 +8577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8675,7 +8683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8734,7 +8742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8788,7 +8796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8955,7 +8963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9098,7 +9106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9204,7 +9212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9263,7 +9271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9317,7 +9325,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9484,7 +9492,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_flutter_main.json
index d3d3467..cb15b43 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_flutter_main.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8569,7 +8577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8675,7 +8683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8734,7 +8742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8788,7 +8796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8955,7 +8963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9098,7 +9106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9204,7 +9212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9263,7 +9271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9317,7 +9325,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9484,7 +9492,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
index 64d63f8..aa52652 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8049,7 +8057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8163,7 +8171,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8222,7 +8230,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8276,7 +8284,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8443,7 +8451,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8800,7 +8808,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8845,7 +8853,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8904,7 +8912,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11995,7 +12003,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12101,7 +12109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12160,7 +12168,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12214,7 +12222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12381,7 +12389,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12524,7 +12532,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12630,7 +12638,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12689,7 +12697,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12743,7 +12751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12910,7 +12918,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_prod_main.json b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_prod_main.json
index 10ab3ec..8ecdba7 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_prod_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8049,7 +8057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8163,7 +8171,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8222,7 +8230,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8276,7 +8284,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8443,7 +8451,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8800,7 +8808,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8845,7 +8853,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8904,7 +8912,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11995,7 +12003,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12101,7 +12109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12160,7 +12168,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12214,7 +12222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12381,7 +12389,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12524,7 +12532,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12630,7 +12638,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12689,7 +12697,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12743,7 +12751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12910,7 +12918,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
index 1ead16c..ae55c13 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8605,7 +8613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8711,7 +8719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8770,7 +8778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8824,7 +8832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8991,7 +8999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9134,7 +9142,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9240,7 +9248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9299,7 +9307,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9353,7 +9361,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9520,7 +9528,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_staging_main.json b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_staging_main.json
index 34594be..e663a99 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_font_subset_staging_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8605,7 +8613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8711,7 +8719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8770,7 +8778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8824,7 +8832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8991,7 +8999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9134,7 +9142,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9240,7 +9248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9299,7 +9307,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9353,7 +9361,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9520,7 +9528,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_maven_no_lto_prod_flutter-3.8-candidate.10.json
index 64d63f8..aa52652 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_prod_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8049,7 +8057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8163,7 +8171,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8222,7 +8230,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8276,7 +8284,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8443,7 +8451,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8800,7 +8808,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8845,7 +8853,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8904,7 +8912,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11995,7 +12003,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12101,7 +12109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12160,7 +12168,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12214,7 +12222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12381,7 +12389,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12524,7 +12532,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12630,7 +12638,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12689,7 +12697,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12743,7 +12751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12910,7 +12918,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_prod_main.json b/recipes/engine/engine.expected/linux_maven_no_lto_prod_main.json
index 10ab3ec..8ecdba7 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_prod_main.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_prod_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8049,7 +8057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8163,7 +8171,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8222,7 +8230,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8276,7 +8284,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8443,7 +8451,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8800,7 +8808,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8845,7 +8853,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8904,7 +8912,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11995,7 +12003,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12101,7 +12109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12160,7 +12168,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12214,7 +12222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12381,7 +12389,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12524,7 +12532,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12630,7 +12638,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12689,7 +12697,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12743,7 +12751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12910,7 +12918,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_maven_no_lto_staging_flutter-3.8-candidate.10.json
index 1ead16c..ae55c13 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_staging_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8605,7 +8613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8711,7 +8719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8770,7 +8778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8824,7 +8832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8991,7 +8999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9134,7 +9142,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9240,7 +9248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9299,7 +9307,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9353,7 +9361,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9520,7 +9528,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_no_lto_staging_main.json b/recipes/engine/engine.expected/linux_maven_no_lto_staging_main.json
index 34594be..e663a99 100644
--- a/recipes/engine/engine.expected/linux_maven_no_lto_staging_main.json
+++ b/recipes/engine/engine.expected/linux_maven_no_lto_staging_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8605,7 +8613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8711,7 +8719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8770,7 +8778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8824,7 +8832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8991,7 +8999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9134,7 +9142,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9240,7 +9248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9299,7 +9307,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9353,7 +9361,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9520,7 +9528,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_maven_prod_flutter-3.8-candidate.10.json
index d6d3948..478cfb2 100644
--- a/recipes/engine/engine.expected/linux_maven_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_maven_prod_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8044,7 +8052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8158,7 +8166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8217,7 +8225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8271,7 +8279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8438,7 +8446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8795,7 +8803,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8840,7 +8848,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11990,7 +11998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12096,7 +12104,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12155,7 +12163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12209,7 +12217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12519,7 +12527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12625,7 +12633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12684,7 +12692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12738,7 +12746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12905,7 +12913,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_prod_main.json b/recipes/engine/engine.expected/linux_maven_prod_main.json
index d7932a7..5dacc42 100644
--- a/recipes/engine/engine.expected/linux_maven_prod_main.json
+++ b/recipes/engine/engine.expected/linux_maven_prod_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8044,7 +8052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8158,7 +8166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8217,7 +8225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8271,7 +8279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8438,7 +8446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8795,7 +8803,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8840,7 +8848,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11990,7 +11998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12096,7 +12104,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12155,7 +12163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12209,7 +12217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12519,7 +12527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12625,7 +12633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12684,7 +12692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12738,7 +12746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12905,7 +12913,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_maven_staging_flutter-3.8-candidate.10.json
index b4d2ac5..85b8d2b 100644
--- a/recipes/engine/engine.expected/linux_maven_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_maven_staging_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8600,7 +8608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8706,7 +8714,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8765,7 +8773,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8819,7 +8827,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8986,7 +8994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9129,7 +9137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9235,7 +9243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9294,7 +9302,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9348,7 +9356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9515,7 +9523,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_maven_staging_main.json b/recipes/engine/engine.expected/linux_maven_staging_main.json
index 99802cd..f4c6bb4 100644
--- a/recipes/engine/engine.expected/linux_maven_staging_main.json
+++ b/recipes/engine/engine.expected/linux_maven_staging_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8600,7 +8608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8706,7 +8714,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8765,7 +8773,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8819,7 +8827,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8986,7 +8994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9129,7 +9137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9235,7 +9243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9294,7 +9302,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9348,7 +9356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9515,7 +9523,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_no_lto_flutter_flutter-3.8-candidate.10.json
index d3d3467..cb15b43 100644
--- a/recipes/engine/engine.expected/linux_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8569,7 +8577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8675,7 +8683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8734,7 +8742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8788,7 +8796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8955,7 +8963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9098,7 +9106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9204,7 +9212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9263,7 +9271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9317,7 +9325,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9484,7 +9492,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_no_lto_flutter_main.json b/recipes/engine/engine.expected/linux_no_lto_flutter_main.json
index d3d3467..cb15b43 100644
--- a/recipes/engine/engine.expected/linux_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_no_lto_flutter_main.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8569,7 +8577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8675,7 +8683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8734,7 +8742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8788,7 +8796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8955,7 +8963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9098,7 +9106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9204,7 +9212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9263,7 +9271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9317,7 +9325,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9484,7 +9492,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index d3d3467..cb15b43 100644
--- a/recipes/engine/engine.expected/linux_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8569,7 +8577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8675,7 +8683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8734,7 +8742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8788,7 +8796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8955,7 +8963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9098,7 +9106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9204,7 +9212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9263,7 +9271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9317,7 +9325,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9484,7 +9492,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/linux_no_lto_font_subset_flutter_main.json
index d3d3467..cb15b43 100644
--- a/recipes/engine/engine.expected/linux_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_no_lto_font_subset_flutter_main.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8569,7 +8577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8675,7 +8683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8734,7 +8742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8788,7 +8796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8955,7 +8963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9098,7 +9106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9204,7 +9212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9263,7 +9271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9317,7 +9325,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9484,7 +9492,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_no_lto_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
index 64d63f8..aa52652 100644
--- a/recipes/engine/engine.expected/linux_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8049,7 +8057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8163,7 +8171,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8222,7 +8230,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8276,7 +8284,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8443,7 +8451,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8800,7 +8808,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8845,7 +8853,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8904,7 +8912,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11995,7 +12003,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12101,7 +12109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12160,7 +12168,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12214,7 +12222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12381,7 +12389,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12524,7 +12532,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12630,7 +12638,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12689,7 +12697,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12743,7 +12751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12910,7 +12918,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_no_lto_font_subset_prod_main.json b/recipes/engine/engine.expected/linux_no_lto_font_subset_prod_main.json
index 10ab3ec..8ecdba7 100644
--- a/recipes/engine/engine.expected/linux_no_lto_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/linux_no_lto_font_subset_prod_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8049,7 +8057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8163,7 +8171,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8222,7 +8230,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8276,7 +8284,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8443,7 +8451,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8800,7 +8808,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8845,7 +8853,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8904,7 +8912,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11995,7 +12003,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12101,7 +12109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12160,7 +12168,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12214,7 +12222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12381,7 +12389,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12524,7 +12532,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12630,7 +12638,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12689,7 +12697,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12743,7 +12751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12910,7 +12918,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_no_lto_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
index 1ead16c..ae55c13 100644
--- a/recipes/engine/engine.expected/linux_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8605,7 +8613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8711,7 +8719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8770,7 +8778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8824,7 +8832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8991,7 +8999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9134,7 +9142,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9240,7 +9248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9299,7 +9307,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9353,7 +9361,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9520,7 +9528,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_no_lto_font_subset_staging_main.json b/recipes/engine/engine.expected/linux_no_lto_font_subset_staging_main.json
index 34594be..e663a99 100644
--- a/recipes/engine/engine.expected/linux_no_lto_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/linux_no_lto_font_subset_staging_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8605,7 +8613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8711,7 +8719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8770,7 +8778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8824,7 +8832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8991,7 +8999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9134,7 +9142,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9240,7 +9248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9299,7 +9307,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9353,7 +9361,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9520,7 +9528,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_no_lto_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_no_lto_prod_flutter-3.8-candidate.10.json
index 64d63f8..aa52652 100644
--- a/recipes/engine/engine.expected/linux_no_lto_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_no_lto_prod_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8049,7 +8057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8163,7 +8171,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8222,7 +8230,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8276,7 +8284,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8443,7 +8451,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8800,7 +8808,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8845,7 +8853,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8904,7 +8912,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11995,7 +12003,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12101,7 +12109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12160,7 +12168,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12214,7 +12222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12381,7 +12389,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12524,7 +12532,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12630,7 +12638,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12689,7 +12697,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12743,7 +12751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12910,7 +12918,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_no_lto_prod_main.json b/recipes/engine/engine.expected/linux_no_lto_prod_main.json
index 10ab3ec..8ecdba7 100644
--- a/recipes/engine/engine.expected/linux_no_lto_prod_main.json
+++ b/recipes/engine/engine.expected/linux_no_lto_prod_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8049,7 +8057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8163,7 +8171,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8222,7 +8230,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8276,7 +8284,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8443,7 +8451,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8800,7 +8808,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8845,7 +8853,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8904,7 +8912,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11995,7 +12003,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12101,7 +12109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12160,7 +12168,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12214,7 +12222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12381,7 +12389,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12524,7 +12532,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12630,7 +12638,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12689,7 +12697,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12743,7 +12751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12910,7 +12918,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_no_lto_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_no_lto_staging_flutter-3.8-candidate.10.json
index 1ead16c..ae55c13 100644
--- a/recipes/engine/engine.expected/linux_no_lto_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_no_lto_staging_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8605,7 +8613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8711,7 +8719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8770,7 +8778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8824,7 +8832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8991,7 +8999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9134,7 +9142,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9240,7 +9248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9299,7 +9307,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9353,7 +9361,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9520,7 +9528,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_no_lto_staging_main.json b/recipes/engine/engine.expected/linux_no_lto_staging_main.json
index 34594be..e663a99 100644
--- a/recipes/engine/engine.expected/linux_no_lto_staging_main.json
+++ b/recipes/engine/engine.expected/linux_no_lto_staging_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8605,7 +8613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8711,7 +8719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8770,7 +8778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8824,7 +8832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8991,7 +8999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9134,7 +9142,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9240,7 +9248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9299,7 +9307,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9353,7 +9361,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9520,7 +9528,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_prod_flutter-3.8-candidate.10.json
index d6d3948..478cfb2 100644
--- a/recipes/engine/engine.expected/linux_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_prod_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8044,7 +8052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8158,7 +8166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8217,7 +8225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8271,7 +8279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8438,7 +8446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8795,7 +8803,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8840,7 +8848,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11990,7 +11998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12096,7 +12104,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12155,7 +12163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12209,7 +12217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12519,7 +12527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12625,7 +12633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12684,7 +12692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12738,7 +12746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12905,7 +12913,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_prod_main.json b/recipes/engine/engine.expected/linux_prod_main.json
index d7932a7..5dacc42 100644
--- a/recipes/engine/engine.expected/linux_prod_main.json
+++ b/recipes/engine/engine.expected/linux_prod_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8044,7 +8052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8158,7 +8166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8217,7 +8225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8271,7 +8279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8438,7 +8446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8795,7 +8803,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -8840,7 +8848,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -11990,7 +11998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12096,7 +12104,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12155,7 +12163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12209,7 +12217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -12519,7 +12527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12625,7 +12633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12684,7 +12692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12738,7 +12746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12905,7 +12913,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_staging_flutter-3.8-candidate.10.json
index b4d2ac5..85b8d2b 100644
--- a/recipes/engine/engine.expected/linux_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_staging_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8600,7 +8608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8706,7 +8714,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8765,7 +8773,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8819,7 +8827,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8986,7 +8994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9129,7 +9137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9235,7 +9243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9294,7 +9302,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9348,7 +9356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9515,7 +9523,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_staging_main.json b/recipes/engine/engine.expected/linux_staging_main.json
index 99802cd..f4c6bb4 100644
--- a/recipes/engine/engine.expected/linux_staging_main.json
+++ b/recipes/engine/engine.expected/linux_staging_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8600,7 +8608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8706,7 +8714,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8765,7 +8773,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8819,7 +8827,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8986,7 +8994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9129,7 +9137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9235,7 +9243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9294,7 +9302,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9348,7 +9356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9515,7 +9523,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_flutter_flutter-3.8-candidate.10.json
index 2eaea93..e71c73b 100644
--- a/recipes/engine/engine.expected/linux_upload_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_flutter_flutter-3.8-candidate.10.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8668,7 +8676,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8774,7 +8782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8833,7 +8841,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8887,7 +8895,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9054,7 +9062,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9303,7 +9311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9362,7 +9370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9416,7 +9424,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9583,7 +9591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_flutter_main.json b/recipes/engine/engine.expected/linux_upload_flutter_main.json
index 2eaea93..e71c73b 100644
--- a/recipes/engine/engine.expected/linux_upload_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_upload_flutter_main.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8668,7 +8676,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8774,7 +8782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8833,7 +8841,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8887,7 +8895,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9054,7 +9062,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9303,7 +9311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9362,7 +9370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9416,7 +9424,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9583,7 +9591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_font_subset_flutter_flutter-3.8-candidate.10.json
index 2eaea93..e71c73b 100644
--- a/recipes/engine/engine.expected/linux_upload_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8668,7 +8676,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8774,7 +8782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8833,7 +8841,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8887,7 +8895,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9054,7 +9062,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9303,7 +9311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9362,7 +9370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9416,7 +9424,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9583,7 +9591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_font_subset_flutter_main.json b/recipes/engine/engine.expected/linux_upload_font_subset_flutter_main.json
index 2eaea93..e71c73b 100644
--- a/recipes/engine/engine.expected/linux_upload_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_upload_font_subset_flutter_main.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8668,7 +8676,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8774,7 +8782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8833,7 +8841,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8887,7 +8895,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9054,7 +9062,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9303,7 +9311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9362,7 +9370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9416,7 +9424,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9583,7 +9591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_font_subset_prod_flutter-3.8-candidate.10.json
index 02013af..e1323fe 100644
--- a/recipes/engine/engine.expected/linux_upload_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_font_subset_prod_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3298,7 +3306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3406,7 +3414,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3465,7 +3473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3519,7 +3527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3686,7 +3694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3879,7 +3887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3986,7 +3994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4045,7 +4053,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4099,7 +4107,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4266,7 +4274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4466,7 +4474,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4525,7 +4533,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4579,7 +4587,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4746,7 +4754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4840,7 +4848,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4948,7 +4956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5007,7 +5015,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5061,7 +5069,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5228,7 +5236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5428,7 +5436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5487,7 +5495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5541,7 +5549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5708,7 +5716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5803,7 +5811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5908,7 +5916,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5967,7 +5975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6021,7 +6029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6188,7 +6196,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8894,7 +8902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9008,7 +9016,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9067,7 +9075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9121,7 +9129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9288,7 +9296,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9645,7 +9653,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9690,7 +9698,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9749,7 +9757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14044,7 +14052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14150,7 +14158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14209,7 +14217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14263,7 +14271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14430,7 +14438,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14573,7 +14581,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14679,7 +14687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14738,7 +14746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14792,7 +14800,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14959,7 +14967,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_font_subset_prod_main.json b/recipes/engine/engine.expected/linux_upload_font_subset_prod_main.json
index b4b1fa1..ff7b6e7 100644
--- a/recipes/engine/engine.expected/linux_upload_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/linux_upload_font_subset_prod_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3298,7 +3306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3406,7 +3414,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3465,7 +3473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3519,7 +3527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3686,7 +3694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3879,7 +3887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3986,7 +3994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4045,7 +4053,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4099,7 +4107,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4266,7 +4274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4466,7 +4474,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4525,7 +4533,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4579,7 +4587,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4746,7 +4754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4840,7 +4848,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4948,7 +4956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5007,7 +5015,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5061,7 +5069,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5228,7 +5236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5428,7 +5436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5487,7 +5495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5541,7 +5549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5708,7 +5716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5803,7 +5811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5908,7 +5916,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5967,7 +5975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6021,7 +6029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6188,7 +6196,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8894,7 +8902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9008,7 +9016,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9067,7 +9075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9121,7 +9129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9288,7 +9296,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9645,7 +9653,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9690,7 +9698,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9749,7 +9757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14044,7 +14052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14150,7 +14158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14209,7 +14217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14263,7 +14271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14430,7 +14438,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14573,7 +14581,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14679,7 +14687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14738,7 +14746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14792,7 +14800,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14959,7 +14967,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_font_subset_staging_flutter-3.8-candidate.10.json
index 386aa5a..b73bbd9 100644
--- a/recipes/engine/engine.expected/linux_upload_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_font_subset_staging_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8704,7 +8712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8810,7 +8818,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8869,7 +8877,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8923,7 +8931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9090,7 +9098,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9233,7 +9241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9339,7 +9347,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9398,7 +9406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9452,7 +9460,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9619,7 +9627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_font_subset_staging_main.json b/recipes/engine/engine.expected/linux_upload_font_subset_staging_main.json
index 6de876c..798c7fc 100644
--- a/recipes/engine/engine.expected/linux_upload_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/linux_upload_font_subset_staging_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8704,7 +8712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8810,7 +8818,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8869,7 +8877,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8923,7 +8931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9090,7 +9098,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9233,7 +9241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9339,7 +9347,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9398,7 +9406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9452,7 +9460,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9619,7 +9627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_maven_flutter_flutter-3.8-candidate.10.json
index 2eaea93..e71c73b 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_flutter_flutter-3.8-candidate.10.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8668,7 +8676,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8774,7 +8782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8833,7 +8841,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8887,7 +8895,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9054,7 +9062,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9303,7 +9311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9362,7 +9370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9416,7 +9424,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9583,7 +9591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_flutter_main.json b/recipes/engine/engine.expected/linux_upload_maven_flutter_main.json
index 2eaea93..e71c73b 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_flutter_main.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8668,7 +8676,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8774,7 +8782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8833,7 +8841,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8887,7 +8895,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9054,7 +9062,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9303,7 +9311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9362,7 +9370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9416,7 +9424,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9583,7 +9591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_maven_font_subset_flutter_flutter-3.8-candidate.10.json
index 2eaea93..e71c73b 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8668,7 +8676,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8774,7 +8782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8833,7 +8841,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8887,7 +8895,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9054,7 +9062,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9303,7 +9311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9362,7 +9370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9416,7 +9424,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9583,7 +9591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_font_subset_flutter_main.json b/recipes/engine/engine.expected/linux_upload_maven_font_subset_flutter_main.json
index 2eaea93..e71c73b 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_font_subset_flutter_main.json
@@ -620,12 +620,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -633,8 +640,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -679,19 +686,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -706,7 +710,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -751,7 +755,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -761,9 +765,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -812,7 +816,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -820,7 +824,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -830,7 +834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -935,7 +939,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -994,7 +998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1048,7 +1052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1215,12 +1219,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1228,8 +1239,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1266,19 +1277,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1293,7 +1301,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1330,7 +1338,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1340,9 +1348,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1383,7 +1391,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1391,7 +1399,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1401,7 +1409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1451,7 +1459,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1562,7 +1570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1621,7 +1629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1675,7 +1683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1842,7 +1850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1939,7 +1947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2048,7 +2056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2107,7 +2115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2161,7 +2169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2328,7 +2336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2425,7 +2433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2541,7 +2549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2600,7 +2608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2654,7 +2662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2962,7 +2970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3070,7 +3078,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3129,7 +3137,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3183,7 +3191,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3350,7 +3358,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3493,7 +3501,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3600,7 +3608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3659,7 +3667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3713,7 +3721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3880,7 +3888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3974,7 +3982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4080,7 +4088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4139,7 +4147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4193,7 +4201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4562,7 +4570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4675,7 +4683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4842,7 +4850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4936,7 +4944,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5042,7 +5050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5101,7 +5109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5155,7 +5163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5417,7 +5425,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5522,7 +5530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5581,7 +5589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5635,7 +5643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5802,7 +5810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6652,7 +6660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6766,7 +6774,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6825,7 +6833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6879,7 +6887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7046,7 +7054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7403,7 +7411,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7448,7 +7456,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7507,7 +7515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8668,7 +8676,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8774,7 +8782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8833,7 +8841,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8887,7 +8895,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9054,7 +9062,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9303,7 +9311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9362,7 +9370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9416,7 +9424,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9583,7 +9591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_maven_font_subset_prod_flutter-3.8-candidate.10.json
index 02013af..e1323fe 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_font_subset_prod_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3298,7 +3306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3406,7 +3414,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3465,7 +3473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3519,7 +3527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3686,7 +3694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3879,7 +3887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3986,7 +3994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4045,7 +4053,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4099,7 +4107,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4266,7 +4274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4466,7 +4474,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4525,7 +4533,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4579,7 +4587,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4746,7 +4754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4840,7 +4848,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4948,7 +4956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5007,7 +5015,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5061,7 +5069,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5228,7 +5236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5428,7 +5436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5487,7 +5495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5541,7 +5549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5708,7 +5716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5803,7 +5811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5908,7 +5916,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5967,7 +5975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6021,7 +6029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6188,7 +6196,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8894,7 +8902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9008,7 +9016,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9067,7 +9075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9121,7 +9129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9288,7 +9296,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9645,7 +9653,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9690,7 +9698,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9749,7 +9757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14044,7 +14052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14150,7 +14158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14209,7 +14217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14263,7 +14271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14430,7 +14438,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14573,7 +14581,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14679,7 +14687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14738,7 +14746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14792,7 +14800,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14959,7 +14967,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_font_subset_prod_main.json b/recipes/engine/engine.expected/linux_upload_maven_font_subset_prod_main.json
index b4b1fa1..ff7b6e7 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_font_subset_prod_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3298,7 +3306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3406,7 +3414,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3465,7 +3473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3519,7 +3527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3686,7 +3694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3879,7 +3887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3986,7 +3994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4045,7 +4053,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4099,7 +4107,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4266,7 +4274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4466,7 +4474,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4525,7 +4533,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4579,7 +4587,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4746,7 +4754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4840,7 +4848,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4948,7 +4956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5007,7 +5015,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5061,7 +5069,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5228,7 +5236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5428,7 +5436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5487,7 +5495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5541,7 +5549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5708,7 +5716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5803,7 +5811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5908,7 +5916,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5967,7 +5975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6021,7 +6029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6188,7 +6196,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8894,7 +8902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9008,7 +9016,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9067,7 +9075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9121,7 +9129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9288,7 +9296,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9645,7 +9653,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9690,7 +9698,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9749,7 +9757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14044,7 +14052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14150,7 +14158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14209,7 +14217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14263,7 +14271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14430,7 +14438,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14573,7 +14581,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14679,7 +14687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14738,7 +14746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14792,7 +14800,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14959,7 +14967,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_maven_font_subset_staging_flutter-3.8-candidate.10.json
index 386aa5a..b73bbd9 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_font_subset_staging_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8704,7 +8712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8810,7 +8818,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8869,7 +8877,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8923,7 +8931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9090,7 +9098,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9233,7 +9241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9339,7 +9347,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9398,7 +9406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9452,7 +9460,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9619,7 +9627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_font_subset_staging_main.json b/recipes/engine/engine.expected/linux_upload_maven_font_subset_staging_main.json
index 6de876c..798c7fc 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_font_subset_staging_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8704,7 +8712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8810,7 +8818,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8869,7 +8877,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8923,7 +8931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9090,7 +9098,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9233,7 +9241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9339,7 +9347,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9398,7 +9406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9452,7 +9460,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9619,7 +9627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_flutter_flutter-3.8-candidate.10.json
index ee55229..94d7712 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8673,7 +8681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8779,7 +8787,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8838,7 +8846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8892,7 +8900,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9059,7 +9067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9202,7 +9210,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9308,7 +9316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9367,7 +9375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9421,7 +9429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_flutter_main.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_flutter_main.json
index ee55229..94d7712 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_flutter_main.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8673,7 +8681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8779,7 +8787,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8838,7 +8846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8892,7 +8900,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9059,7 +9067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9202,7 +9210,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9308,7 +9316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9367,7 +9375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9421,7 +9429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index ee55229..94d7712 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8673,7 +8681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8779,7 +8787,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8838,7 +8846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8892,7 +8900,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9059,7 +9067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9202,7 +9210,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9308,7 +9316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9367,7 +9375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9421,7 +9429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_flutter_main.json
index ee55229..94d7712 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_flutter_main.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8673,7 +8681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8779,7 +8787,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8838,7 +8846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8892,7 +8900,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9059,7 +9067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9202,7 +9210,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9308,7 +9316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9367,7 +9375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9421,7 +9429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
index 84c37a5..747fd99 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3302,7 +3310,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3410,7 +3418,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3469,7 +3477,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3523,7 +3531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3883,7 +3891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3990,7 +3998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4049,7 +4057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4103,7 +4111,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4270,7 +4278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4470,7 +4478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4583,7 +4591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4844,7 +4852,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4952,7 +4960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5011,7 +5019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5065,7 +5073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5232,7 +5240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5432,7 +5440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5491,7 +5499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5545,7 +5553,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5807,7 +5815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5912,7 +5920,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5971,7 +5979,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6025,7 +6033,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9013,7 +9021,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9072,7 +9080,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9126,7 +9134,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9293,7 +9301,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9650,7 +9658,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9695,7 +9703,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9754,7 +9762,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14049,7 +14057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14155,7 +14163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14214,7 +14222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14268,7 +14276,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14435,7 +14443,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14578,7 +14586,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14684,7 +14692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14743,7 +14751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14797,7 +14805,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14964,7 +14972,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_prod_main.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_prod_main.json
index 08b9720..a2b632b 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_prod_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3302,7 +3310,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3410,7 +3418,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3469,7 +3477,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3523,7 +3531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3883,7 +3891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3990,7 +3998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4049,7 +4057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4103,7 +4111,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4270,7 +4278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4470,7 +4478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4583,7 +4591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4844,7 +4852,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4952,7 +4960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5011,7 +5019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5065,7 +5073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5232,7 +5240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5432,7 +5440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5491,7 +5499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5545,7 +5553,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5807,7 +5815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5912,7 +5920,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5971,7 +5979,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6025,7 +6033,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9013,7 +9021,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9072,7 +9080,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9126,7 +9134,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9293,7 +9301,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9650,7 +9658,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9695,7 +9703,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9754,7 +9762,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14049,7 +14057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14155,7 +14163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14214,7 +14222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14268,7 +14276,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14435,7 +14443,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14578,7 +14586,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14684,7 +14692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14743,7 +14751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14797,7 +14805,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14964,7 +14972,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
index 6bb1e00..cef01e3 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8709,7 +8717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8815,7 +8823,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8874,7 +8882,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8928,7 +8936,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9095,7 +9103,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9238,7 +9246,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9344,7 +9352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9403,7 +9411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9457,7 +9465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_staging_main.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_staging_main.json
index c94f1b6..0d22fc6 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_font_subset_staging_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8709,7 +8717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8815,7 +8823,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8874,7 +8882,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8928,7 +8936,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9095,7 +9103,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9238,7 +9246,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9344,7 +9352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9403,7 +9411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9457,7 +9465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_prod_flutter-3.8-candidate.10.json
index 84c37a5..747fd99 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_prod_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3302,7 +3310,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3410,7 +3418,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3469,7 +3477,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3523,7 +3531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3883,7 +3891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3990,7 +3998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4049,7 +4057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4103,7 +4111,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4270,7 +4278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4470,7 +4478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4583,7 +4591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4844,7 +4852,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4952,7 +4960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5011,7 +5019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5065,7 +5073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5232,7 +5240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5432,7 +5440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5491,7 +5499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5545,7 +5553,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5807,7 +5815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5912,7 +5920,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5971,7 +5979,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6025,7 +6033,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9013,7 +9021,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9072,7 +9080,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9126,7 +9134,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9293,7 +9301,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9650,7 +9658,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9695,7 +9703,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9754,7 +9762,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14049,7 +14057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14155,7 +14163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14214,7 +14222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14268,7 +14276,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14435,7 +14443,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14578,7 +14586,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14684,7 +14692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14743,7 +14751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14797,7 +14805,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14964,7 +14972,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_prod_main.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_prod_main.json
index 08b9720..a2b632b 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_prod_main.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_prod_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3302,7 +3310,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3410,7 +3418,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3469,7 +3477,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3523,7 +3531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3883,7 +3891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3990,7 +3998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4049,7 +4057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4103,7 +4111,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4270,7 +4278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4470,7 +4478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4583,7 +4591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4844,7 +4852,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4952,7 +4960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5011,7 +5019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5065,7 +5073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5232,7 +5240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5432,7 +5440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5491,7 +5499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5545,7 +5553,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5807,7 +5815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5912,7 +5920,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5971,7 +5979,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6025,7 +6033,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9013,7 +9021,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9072,7 +9080,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9126,7 +9134,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9293,7 +9301,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9650,7 +9658,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9695,7 +9703,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9754,7 +9762,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14049,7 +14057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14155,7 +14163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14214,7 +14222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14268,7 +14276,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14435,7 +14443,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14578,7 +14586,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14684,7 +14692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14743,7 +14751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14797,7 +14805,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14964,7 +14972,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_staging_flutter-3.8-candidate.10.json
index 6bb1e00..cef01e3 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_staging_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8709,7 +8717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8815,7 +8823,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8874,7 +8882,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8928,7 +8936,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9095,7 +9103,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9238,7 +9246,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9344,7 +9352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9403,7 +9411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9457,7 +9465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_no_lto_staging_main.json b/recipes/engine/engine.expected/linux_upload_maven_no_lto_staging_main.json
index c94f1b6..0d22fc6 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_no_lto_staging_main.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_no_lto_staging_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8709,7 +8717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8815,7 +8823,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8874,7 +8882,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8928,7 +8936,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9095,7 +9103,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9238,7 +9246,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9344,7 +9352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9403,7 +9411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9457,7 +9465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_maven_prod_flutter-3.8-candidate.10.json
index 02013af..e1323fe 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_prod_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3298,7 +3306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3406,7 +3414,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3465,7 +3473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3519,7 +3527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3686,7 +3694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3879,7 +3887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3986,7 +3994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4045,7 +4053,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4099,7 +4107,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4266,7 +4274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4466,7 +4474,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4525,7 +4533,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4579,7 +4587,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4746,7 +4754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4840,7 +4848,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4948,7 +4956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5007,7 +5015,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5061,7 +5069,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5228,7 +5236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5428,7 +5436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5487,7 +5495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5541,7 +5549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5708,7 +5716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5803,7 +5811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5908,7 +5916,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5967,7 +5975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6021,7 +6029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6188,7 +6196,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8894,7 +8902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9008,7 +9016,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9067,7 +9075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9121,7 +9129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9288,7 +9296,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9645,7 +9653,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9690,7 +9698,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9749,7 +9757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14044,7 +14052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14150,7 +14158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14209,7 +14217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14263,7 +14271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14430,7 +14438,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14573,7 +14581,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14679,7 +14687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14738,7 +14746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14792,7 +14800,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14959,7 +14967,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_prod_main.json b/recipes/engine/engine.expected/linux_upload_maven_prod_main.json
index b4b1fa1..ff7b6e7 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_prod_main.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_prod_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3298,7 +3306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3406,7 +3414,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3465,7 +3473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3519,7 +3527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3686,7 +3694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3879,7 +3887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3986,7 +3994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4045,7 +4053,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4099,7 +4107,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4266,7 +4274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4466,7 +4474,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4525,7 +4533,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4579,7 +4587,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4746,7 +4754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4840,7 +4848,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4948,7 +4956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5007,7 +5015,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5061,7 +5069,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5228,7 +5236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5428,7 +5436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5487,7 +5495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5541,7 +5549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5708,7 +5716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5803,7 +5811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5908,7 +5916,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5967,7 +5975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6021,7 +6029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6188,7 +6196,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8894,7 +8902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9008,7 +9016,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9067,7 +9075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9121,7 +9129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9288,7 +9296,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9645,7 +9653,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9690,7 +9698,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9749,7 +9757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14044,7 +14052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14150,7 +14158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14209,7 +14217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14263,7 +14271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14430,7 +14438,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14573,7 +14581,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14679,7 +14687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14738,7 +14746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14792,7 +14800,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14959,7 +14967,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_maven_staging_flutter-3.8-candidate.10.json
index 386aa5a..b73bbd9 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_staging_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8704,7 +8712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8810,7 +8818,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8869,7 +8877,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8923,7 +8931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9090,7 +9098,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9233,7 +9241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9339,7 +9347,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9398,7 +9406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9452,7 +9460,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9619,7 +9627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_maven_staging_main.json b/recipes/engine/engine.expected/linux_upload_maven_staging_main.json
index 6de876c..798c7fc 100644
--- a/recipes/engine/engine.expected/linux_upload_maven_staging_main.json
+++ b/recipes/engine/engine.expected/linux_upload_maven_staging_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8704,7 +8712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8810,7 +8818,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8869,7 +8877,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8923,7 +8931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9090,7 +9098,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9233,7 +9241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9339,7 +9347,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9398,7 +9406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9452,7 +9460,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9619,7 +9627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_no_lto_flutter_flutter-3.8-candidate.10.json
index ee55229..94d7712 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8673,7 +8681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8779,7 +8787,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8838,7 +8846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8892,7 +8900,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9059,7 +9067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9202,7 +9210,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9308,7 +9316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9367,7 +9375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9421,7 +9429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_flutter_main.json b/recipes/engine/engine.expected/linux_upload_no_lto_flutter_main.json
index ee55229..94d7712 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_flutter_main.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8673,7 +8681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8779,7 +8787,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8838,7 +8846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8892,7 +8900,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9059,7 +9067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9202,7 +9210,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9308,7 +9316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9367,7 +9375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9421,7 +9429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index ee55229..94d7712 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8673,7 +8681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8779,7 +8787,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8838,7 +8846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8892,7 +8900,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9059,7 +9067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9202,7 +9210,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9308,7 +9316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9367,7 +9375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9421,7 +9429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_flutter_main.json
index ee55229..94d7712 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_flutter_main.json
@@ -623,12 +623,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -636,8 +643,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -682,19 +689,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -709,7 +713,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -754,7 +758,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -764,9 +768,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -815,7 +819,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -823,7 +827,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -833,7 +837,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -938,7 +942,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -997,7 +1001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1051,7 +1055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1218,12 +1222,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1231,8 +1242,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1269,19 +1280,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1296,7 +1304,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1333,7 +1341,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1343,9 +1351,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1386,7 +1394,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1394,7 +1402,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1404,7 +1412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1454,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1565,7 +1573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1624,7 +1632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1678,7 +1686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1845,7 +1853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1942,7 +1950,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2051,7 +2059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2110,7 +2118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2164,7 +2172,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2331,7 +2339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2428,7 +2436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2544,7 +2552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2603,7 +2611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2657,7 +2665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2824,7 +2832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2966,7 +2974,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3074,7 +3082,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3187,7 +3195,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3354,7 +3362,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3497,7 +3505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3604,7 +3612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3663,7 +3671,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3717,7 +3725,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -3978,7 +3986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4084,7 +4092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4143,7 +4151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4197,7 +4205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4458,7 +4466,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4566,7 +4574,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4625,7 +4633,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4679,7 +4687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4846,7 +4854,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4940,7 +4948,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5046,7 +5054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5105,7 +5113,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5159,7 +5167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5421,7 +5429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5526,7 +5534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5585,7 +5593,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5639,7 +5647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5806,7 +5814,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6657,7 +6665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6771,7 +6779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6830,7 +6838,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6884,7 +6892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7408,7 +7416,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7453,7 +7461,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7512,7 +7520,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8673,7 +8681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8779,7 +8787,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8838,7 +8846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8892,7 +8900,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9059,7 +9067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9202,7 +9210,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9308,7 +9316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9367,7 +9375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9421,7 +9429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
index 84c37a5..747fd99 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3302,7 +3310,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3410,7 +3418,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3469,7 +3477,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3523,7 +3531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3883,7 +3891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3990,7 +3998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4049,7 +4057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4103,7 +4111,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4270,7 +4278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4470,7 +4478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4583,7 +4591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4844,7 +4852,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4952,7 +4960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5011,7 +5019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5065,7 +5073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5232,7 +5240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5432,7 +5440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5491,7 +5499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5545,7 +5553,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5807,7 +5815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5912,7 +5920,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5971,7 +5979,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6025,7 +6033,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9013,7 +9021,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9072,7 +9080,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9126,7 +9134,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9293,7 +9301,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9650,7 +9658,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9695,7 +9703,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9754,7 +9762,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14049,7 +14057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14155,7 +14163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14214,7 +14222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14268,7 +14276,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14435,7 +14443,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14578,7 +14586,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14684,7 +14692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14743,7 +14751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14797,7 +14805,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14964,7 +14972,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_prod_main.json b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_prod_main.json
index 08b9720..a2b632b 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_prod_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3302,7 +3310,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3410,7 +3418,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3469,7 +3477,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3523,7 +3531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3883,7 +3891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3990,7 +3998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4049,7 +4057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4103,7 +4111,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4270,7 +4278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4470,7 +4478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4583,7 +4591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4844,7 +4852,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4952,7 +4960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5011,7 +5019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5065,7 +5073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5232,7 +5240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5432,7 +5440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5491,7 +5499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5545,7 +5553,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5807,7 +5815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5912,7 +5920,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5971,7 +5979,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6025,7 +6033,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9013,7 +9021,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9072,7 +9080,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9126,7 +9134,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9293,7 +9301,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9650,7 +9658,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9695,7 +9703,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9754,7 +9762,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14049,7 +14057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14155,7 +14163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14214,7 +14222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14268,7 +14276,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14435,7 +14443,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14578,7 +14586,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14684,7 +14692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14743,7 +14751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14797,7 +14805,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14964,7 +14972,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
index 6bb1e00..cef01e3 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8709,7 +8717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8815,7 +8823,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8874,7 +8882,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8928,7 +8936,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9095,7 +9103,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9238,7 +9246,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9344,7 +9352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9403,7 +9411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9457,7 +9465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_staging_main.json b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_staging_main.json
index c94f1b6..0d22fc6 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_font_subset_staging_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8709,7 +8717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8815,7 +8823,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8874,7 +8882,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8928,7 +8936,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9095,7 +9103,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9238,7 +9246,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9344,7 +9352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9403,7 +9411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9457,7 +9465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_no_lto_prod_flutter-3.8-candidate.10.json
index 84c37a5..747fd99 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_prod_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3302,7 +3310,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3410,7 +3418,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3469,7 +3477,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3523,7 +3531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3883,7 +3891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3990,7 +3998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4049,7 +4057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4103,7 +4111,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4270,7 +4278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4470,7 +4478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4583,7 +4591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4844,7 +4852,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4952,7 +4960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5011,7 +5019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5065,7 +5073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5232,7 +5240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5432,7 +5440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5491,7 +5499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5545,7 +5553,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5807,7 +5815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5912,7 +5920,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5971,7 +5979,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6025,7 +6033,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9013,7 +9021,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9072,7 +9080,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9126,7 +9134,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9293,7 +9301,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9650,7 +9658,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9695,7 +9703,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9754,7 +9762,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14049,7 +14057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14155,7 +14163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14214,7 +14222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14268,7 +14276,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14435,7 +14443,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14578,7 +14586,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14684,7 +14692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14743,7 +14751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14797,7 +14805,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14964,7 +14972,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_prod_main.json b/recipes/engine/engine.expected/linux_upload_no_lto_prod_main.json
index 08b9720..a2b632b 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_prod_main.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_prod_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3302,7 +3310,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3410,7 +3418,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3469,7 +3477,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3523,7 +3531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3883,7 +3891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3990,7 +3998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4049,7 +4057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4103,7 +4111,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4270,7 +4278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4364,7 +4372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4470,7 +4478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4583,7 +4591,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4844,7 +4852,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4952,7 +4960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5011,7 +5019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5065,7 +5073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5232,7 +5240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5326,7 +5334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5432,7 +5440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5491,7 +5499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5545,7 +5553,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5807,7 +5815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5912,7 +5920,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5971,7 +5979,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6025,7 +6033,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8899,7 +8907,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9013,7 +9021,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9072,7 +9080,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9126,7 +9134,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9293,7 +9301,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9650,7 +9658,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9695,7 +9703,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9754,7 +9762,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14049,7 +14057,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14155,7 +14163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14214,7 +14222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14268,7 +14276,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14435,7 +14443,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14578,7 +14586,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14684,7 +14692,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14743,7 +14751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14797,7 +14805,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14964,7 +14972,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_no_lto_staging_flutter-3.8-candidate.10.json
index 6bb1e00..cef01e3 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_staging_flutter-3.8-candidate.10.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8709,7 +8717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8815,7 +8823,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8874,7 +8882,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8928,7 +8936,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9095,7 +9103,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9238,7 +9246,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9344,7 +9352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9403,7 +9411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9457,7 +9465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_no_lto_staging_main.json b/recipes/engine/engine.expected/linux_upload_no_lto_staging_main.json
index c94f1b6..0d22fc6 100644
--- a/recipes/engine/engine.expected/linux_upload_no_lto_staging_main.json
+++ b/recipes/engine/engine.expected/linux_upload_no_lto_staging_main.json
@@ -659,12 +659,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -672,8 +679,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -718,19 +725,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -745,7 +749,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -851,7 +855,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -859,7 +863,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -869,7 +873,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -974,7 +978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1033,7 +1037,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1087,7 +1091,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1254,12 +1258,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1267,8 +1278,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1305,19 +1316,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1332,7 +1340,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1369,7 +1377,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1379,9 +1387,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1422,7 +1430,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1430,7 +1438,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1440,7 +1448,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1490,7 +1498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1601,7 +1609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1660,7 +1668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1714,7 +1722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1881,7 +1889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1978,7 +1986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2087,7 +2095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2146,7 +2154,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2200,7 +2208,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2367,7 +2375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2464,7 +2472,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2580,7 +2588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2639,7 +2647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2693,7 +2701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2860,7 +2868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3169,7 +3177,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3223,7 +3231,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3390,7 +3398,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3533,7 +3541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3699,7 +3707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3753,7 +3761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3920,7 +3928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4014,7 +4022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4120,7 +4128,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4179,7 +4187,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4400,7 +4408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4494,7 +4502,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4602,7 +4610,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4661,7 +4669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4715,7 +4723,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4882,7 +4890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4976,7 +4984,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5082,7 +5090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5141,7 +5149,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5195,7 +5203,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5457,7 +5465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5562,7 +5570,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5621,7 +5629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5842,7 +5850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6693,7 +6701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6807,7 +6815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6866,7 +6874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7087,7 +7095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7444,7 +7452,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7489,7 +7497,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7548,7 +7556,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8709,7 +8717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8815,7 +8823,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8874,7 +8882,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8928,7 +8936,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9095,7 +9103,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9238,7 +9246,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9344,7 +9352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9403,7 +9411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9457,7 +9465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_prod_flutter-3.8-candidate.10.json
index 02013af..e1323fe 100644
--- a/recipes/engine/engine.expected/linux_upload_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_prod_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3298,7 +3306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3406,7 +3414,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3465,7 +3473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3519,7 +3527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3686,7 +3694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3879,7 +3887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3986,7 +3994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4045,7 +4053,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4099,7 +4107,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4266,7 +4274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4466,7 +4474,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4525,7 +4533,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4579,7 +4587,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4746,7 +4754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4840,7 +4848,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4948,7 +4956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5007,7 +5015,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5061,7 +5069,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5228,7 +5236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5428,7 +5436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5487,7 +5495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5541,7 +5549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5708,7 +5716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5803,7 +5811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5908,7 +5916,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5967,7 +5975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6021,7 +6029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6188,7 +6196,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8894,7 +8902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9008,7 +9016,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9067,7 +9075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9121,7 +9129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9288,7 +9296,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9645,7 +9653,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9690,7 +9698,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9749,7 +9757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14044,7 +14052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14150,7 +14158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14209,7 +14217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14263,7 +14271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14430,7 +14438,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14573,7 +14581,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14679,7 +14687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14738,7 +14746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14792,7 +14800,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14959,7 +14967,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_prod_main.json b/recipes/engine/engine.expected/linux_upload_prod_main.json
index b4b1fa1..ff7b6e7 100644
--- a/recipes/engine/engine.expected/linux_upload_prod_main.json
+++ b/recipes/engine/engine.expected/linux_upload_prod_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3298,7 +3306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3406,7 +3414,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3465,7 +3473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3519,7 +3527,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3686,7 +3694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3879,7 +3887,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3986,7 +3994,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4045,7 +4053,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4099,7 +4107,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4266,7 +4274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4360,7 +4368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4466,7 +4474,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4525,7 +4533,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4579,7 +4587,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4746,7 +4754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4840,7 +4848,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4948,7 +4956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5007,7 +5015,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5061,7 +5069,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5228,7 +5236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5322,7 +5330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5428,7 +5436,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5487,7 +5495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5541,7 +5549,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5708,7 +5716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5803,7 +5811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5908,7 +5916,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5967,7 +5975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6021,7 +6029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6188,7 +6196,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8894,7 +8902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9008,7 +9016,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9067,7 +9075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9121,7 +9129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9288,7 +9296,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9645,7 +9653,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -9690,7 +9698,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -9749,7 +9757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -14044,7 +14052,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14150,7 +14158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14209,7 +14217,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14263,7 +14271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14430,7 +14438,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -14573,7 +14581,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14679,7 +14687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14738,7 +14746,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14792,7 +14800,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14959,7 +14967,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/linux_upload_staging_flutter-3.8-candidate.10.json
index 386aa5a..b73bbd9 100644
--- a/recipes/engine/engine.expected/linux_upload_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/linux_upload_staging_flutter-3.8-candidate.10.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8704,7 +8712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8810,7 +8818,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8869,7 +8877,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8923,7 +8931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9090,7 +9098,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9233,7 +9241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9339,7 +9347,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9398,7 +9406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9452,7 +9460,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9619,7 +9627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/linux_upload_staging_main.json b/recipes/engine/engine.expected/linux_upload_staging_main.json
index 6de876c..798c7fc 100644
--- a/recipes/engine/engine.expected/linux_upload_staging_main.json
+++ b/recipes/engine/engine.expected/linux_upload_staging_main.json
@@ -656,12 +656,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -669,8 +676,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -715,19 +722,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -742,7 +746,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -787,7 +791,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -797,9 +801,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -848,7 +852,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -856,7 +860,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -866,7 +870,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -971,7 +975,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1030,7 +1034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1084,7 +1088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1251,12 +1255,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1264,8 +1275,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1302,19 +1313,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1329,7 +1337,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1366,7 +1374,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1376,9 +1384,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1419,7 +1427,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1427,7 +1435,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1437,7 +1445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1487,7 +1495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1598,7 +1606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1657,7 +1665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1711,7 +1719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1878,7 +1886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1975,7 +1983,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2084,7 +2092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2143,7 +2151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2197,7 +2205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2364,7 +2372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2461,7 +2469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2577,7 +2585,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2636,7 +2644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2690,7 +2698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2857,7 +2865,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -2998,7 +3006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3106,7 +3114,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3165,7 +3173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3219,7 +3227,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3386,7 +3394,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3529,7 +3537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3636,7 +3644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3695,7 +3703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3916,7 +3924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4010,7 +4018,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4229,7 +4237,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4396,7 +4404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4598,7 +4606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4657,7 +4665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4878,7 +4886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4972,7 +4980,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5078,7 +5086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5137,7 +5145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5191,7 +5199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5358,7 +5366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5453,7 +5461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5558,7 +5566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5617,7 +5625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5671,7 +5679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5838,7 +5846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6688,7 +6696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6802,7 +6810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6861,7 +6869,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6915,7 +6923,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7082,7 +7090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7439,7 +7447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7484,7 +7492,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -7543,7 +7551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8704,7 +8712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8810,7 +8818,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8869,7 +8877,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8923,7 +8931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9090,7 +9098,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9233,7 +9241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9339,7 +9347,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9398,7 +9406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9452,7 +9460,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9619,7 +9627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/mac_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_flutter_flutter-3.8-candidate.10.json
index 5550492..658ab91 100644
--- a/recipes/engine/engine.expected/mac_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_flutter_flutter-3.8-candidate.10.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5734,7 +5742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5788,7 +5796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5955,7 +5963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6050,7 +6058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6156,7 +6164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6215,7 +6223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6269,7 +6277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6436,7 +6444,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6531,7 +6539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6637,7 +6645,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6696,7 +6704,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6750,7 +6758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6917,7 +6925,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7011,7 +7019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7117,7 +7125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7176,7 +7184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7230,7 +7238,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7397,7 +7405,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7492,7 +7500,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7598,7 +7606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7657,7 +7665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7711,7 +7719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7878,7 +7886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7973,7 +7981,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8079,7 +8087,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8138,7 +8146,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8192,7 +8200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8359,7 +8367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8455,7 +8463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8559,7 +8567,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8618,7 +8626,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8672,7 +8680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8839,7 +8847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8938,7 +8946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9042,7 +9050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9101,7 +9109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9155,7 +9163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9322,7 +9330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9418,7 +9426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9522,7 +9530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9581,7 +9589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9635,7 +9643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9802,7 +9810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10196,7 +10204,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10300,7 +10308,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10359,7 +10367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10413,7 +10421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10580,7 +10588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10849,7 +10857,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10953,7 +10961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11012,7 +11020,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11066,7 +11074,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11233,7 +11241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12121,7 +12129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12227,7 +12235,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12286,7 +12294,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12340,7 +12348,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12507,7 +12515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12604,7 +12612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12710,7 +12718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12769,7 +12777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12823,7 +12831,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12990,7 +12998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13292,7 +13300,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13337,7 +13345,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13396,7 +13404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_flutter_main.json b/recipes/engine/engine.expected/mac_flutter_main.json
index 5550492..658ab91 100644
--- a/recipes/engine/engine.expected/mac_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_flutter_main.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5734,7 +5742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5788,7 +5796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5955,7 +5963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6050,7 +6058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6156,7 +6164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6215,7 +6223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6269,7 +6277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6436,7 +6444,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6531,7 +6539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6637,7 +6645,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6696,7 +6704,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6750,7 +6758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6917,7 +6925,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7011,7 +7019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7117,7 +7125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7176,7 +7184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7230,7 +7238,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7397,7 +7405,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7492,7 +7500,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7598,7 +7606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7657,7 +7665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7711,7 +7719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7878,7 +7886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7973,7 +7981,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8079,7 +8087,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8138,7 +8146,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8192,7 +8200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8359,7 +8367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8455,7 +8463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8559,7 +8567,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8618,7 +8626,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8672,7 +8680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8839,7 +8847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8938,7 +8946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9042,7 +9050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9101,7 +9109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9155,7 +9163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9322,7 +9330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9418,7 +9426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9522,7 +9530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9581,7 +9589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9635,7 +9643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9802,7 +9810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10196,7 +10204,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10300,7 +10308,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10359,7 +10367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10413,7 +10421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10580,7 +10588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10849,7 +10857,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10953,7 +10961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11012,7 +11020,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11066,7 +11074,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11233,7 +11241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12121,7 +12129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12227,7 +12235,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12286,7 +12294,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12340,7 +12348,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12507,7 +12515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12604,7 +12612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12710,7 +12718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12769,7 +12777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12823,7 +12831,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12990,7 +12998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13292,7 +13300,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13337,7 +13345,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13396,7 +13404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_font_subset_flutter_flutter-3.8-candidate.10.json
index 5550492..658ab91 100644
--- a/recipes/engine/engine.expected/mac_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5734,7 +5742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5788,7 +5796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5955,7 +5963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6050,7 +6058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6156,7 +6164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6215,7 +6223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6269,7 +6277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6436,7 +6444,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6531,7 +6539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6637,7 +6645,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6696,7 +6704,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6750,7 +6758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6917,7 +6925,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7011,7 +7019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7117,7 +7125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7176,7 +7184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7230,7 +7238,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7397,7 +7405,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7492,7 +7500,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7598,7 +7606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7657,7 +7665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7711,7 +7719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7878,7 +7886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7973,7 +7981,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8079,7 +8087,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8138,7 +8146,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8192,7 +8200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8359,7 +8367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8455,7 +8463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8559,7 +8567,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8618,7 +8626,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8672,7 +8680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8839,7 +8847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8938,7 +8946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9042,7 +9050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9101,7 +9109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9155,7 +9163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9322,7 +9330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9418,7 +9426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9522,7 +9530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9581,7 +9589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9635,7 +9643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9802,7 +9810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10196,7 +10204,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10300,7 +10308,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10359,7 +10367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10413,7 +10421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10580,7 +10588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10849,7 +10857,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10953,7 +10961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11012,7 +11020,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11066,7 +11074,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11233,7 +11241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12121,7 +12129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12227,7 +12235,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12286,7 +12294,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12340,7 +12348,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12507,7 +12515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12604,7 +12612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12710,7 +12718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12769,7 +12777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12823,7 +12831,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12990,7 +12998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13292,7 +13300,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13337,7 +13345,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13396,7 +13404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_font_subset_flutter_main.json b/recipes/engine/engine.expected/mac_font_subset_flutter_main.json
index 5550492..658ab91 100644
--- a/recipes/engine/engine.expected/mac_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_font_subset_flutter_main.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5734,7 +5742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5788,7 +5796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5955,7 +5963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6050,7 +6058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6156,7 +6164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6215,7 +6223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6269,7 +6277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6436,7 +6444,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6531,7 +6539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6637,7 +6645,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6696,7 +6704,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6750,7 +6758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6917,7 +6925,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7011,7 +7019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7117,7 +7125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7176,7 +7184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7230,7 +7238,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7397,7 +7405,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7492,7 +7500,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7598,7 +7606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7657,7 +7665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7711,7 +7719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7878,7 +7886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7973,7 +7981,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8079,7 +8087,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8138,7 +8146,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8192,7 +8200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8359,7 +8367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8455,7 +8463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8559,7 +8567,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8618,7 +8626,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8672,7 +8680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8839,7 +8847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8938,7 +8946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9042,7 +9050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9101,7 +9109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9155,7 +9163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9322,7 +9330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9418,7 +9426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9522,7 +9530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9581,7 +9589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9635,7 +9643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9802,7 +9810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10196,7 +10204,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10300,7 +10308,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10359,7 +10367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10413,7 +10421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10580,7 +10588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10849,7 +10857,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10953,7 +10961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11012,7 +11020,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11066,7 +11074,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11233,7 +11241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12121,7 +12129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12227,7 +12235,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12286,7 +12294,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12340,7 +12348,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12507,7 +12515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12604,7 +12612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12710,7 +12718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12769,7 +12777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12823,7 +12831,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12990,7 +12998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13292,7 +13300,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13337,7 +13345,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13396,7 +13404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_font_subset_prod_flutter-3.8-candidate.10.json
index 09360e8..9cd06b7 100644
--- a/recipes/engine/engine.expected/mac_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_font_subset_prod_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5605,7 +5613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5711,7 +5719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5770,7 +5778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5824,7 +5832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5991,7 +5999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6086,7 +6094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6251,7 +6259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6305,7 +6313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6472,7 +6480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6567,7 +6575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6673,7 +6681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6732,7 +6740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6786,7 +6794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6953,7 +6961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7047,7 +7055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7153,7 +7161,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7212,7 +7220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7266,7 +7274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7433,7 +7441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7528,7 +7536,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7634,7 +7642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7693,7 +7701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7747,7 +7755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7914,7 +7922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8009,7 +8017,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8115,7 +8123,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8174,7 +8182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8228,7 +8236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8395,7 +8403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8491,7 +8499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8595,7 +8603,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8708,7 +8716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8875,7 +8883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8974,7 +8982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9078,7 +9086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9137,7 +9145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9191,7 +9199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9358,7 +9366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9454,7 +9462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9558,7 +9566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9617,7 +9625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9671,7 +9679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9838,7 +9846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10232,7 +10240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10336,7 +10344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10395,7 +10403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10449,7 +10457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10616,7 +10624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10885,7 +10893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10989,7 +10997,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11048,7 +11056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11102,7 +11110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11269,7 +11277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12157,7 +12165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12263,7 +12271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12322,7 +12330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12543,7 +12551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12640,7 +12648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12746,7 +12754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12805,7 +12813,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12859,7 +12867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13026,7 +13034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13328,7 +13336,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13373,7 +13381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13432,7 +13440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_font_subset_prod_main.json b/recipes/engine/engine.expected/mac_font_subset_prod_main.json
index a0d6704..e47c20d 100644
--- a/recipes/engine/engine.expected/mac_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/mac_font_subset_prod_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5605,7 +5613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5711,7 +5719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5770,7 +5778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5824,7 +5832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5991,7 +5999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6086,7 +6094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6251,7 +6259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6305,7 +6313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6472,7 +6480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6567,7 +6575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6673,7 +6681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6732,7 +6740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6786,7 +6794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6953,7 +6961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7047,7 +7055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7153,7 +7161,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7212,7 +7220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7266,7 +7274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7433,7 +7441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7528,7 +7536,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7634,7 +7642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7693,7 +7701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7747,7 +7755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7914,7 +7922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8009,7 +8017,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8115,7 +8123,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8174,7 +8182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8228,7 +8236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8395,7 +8403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8491,7 +8499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8595,7 +8603,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8708,7 +8716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8875,7 +8883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8974,7 +8982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9078,7 +9086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9137,7 +9145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9191,7 +9199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9358,7 +9366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9454,7 +9462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9558,7 +9566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9617,7 +9625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9671,7 +9679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9838,7 +9846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10232,7 +10240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10336,7 +10344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10395,7 +10403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10449,7 +10457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10616,7 +10624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10885,7 +10893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10989,7 +10997,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11048,7 +11056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11102,7 +11110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11269,7 +11277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12157,7 +12165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12263,7 +12271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12322,7 +12330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12543,7 +12551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12640,7 +12648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12746,7 +12754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12805,7 +12813,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12859,7 +12867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13026,7 +13034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13328,7 +13336,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13373,7 +13381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13432,7 +13440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_font_subset_staging_flutter-3.8-candidate.10.json
index 88c0994..dfb3c30 100644
--- a/recipes/engine/engine.expected/mac_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_font_subset_staging_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5605,7 +5613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5711,7 +5719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5770,7 +5778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5824,7 +5832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5991,7 +5999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6086,7 +6094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6251,7 +6259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6305,7 +6313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6472,7 +6480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6567,7 +6575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6673,7 +6681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6732,7 +6740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6786,7 +6794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6953,7 +6961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7047,7 +7055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7153,7 +7161,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7212,7 +7220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7266,7 +7274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7433,7 +7441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7528,7 +7536,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7634,7 +7642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7693,7 +7701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7747,7 +7755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7914,7 +7922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8009,7 +8017,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8115,7 +8123,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8174,7 +8182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8228,7 +8236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8395,7 +8403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8491,7 +8499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8595,7 +8603,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8708,7 +8716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8875,7 +8883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8974,7 +8982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9078,7 +9086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9137,7 +9145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9191,7 +9199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9358,7 +9366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9454,7 +9462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9558,7 +9566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9617,7 +9625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9671,7 +9679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9838,7 +9846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10232,7 +10240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10336,7 +10344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10395,7 +10403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10449,7 +10457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10616,7 +10624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10885,7 +10893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10989,7 +10997,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11048,7 +11056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11102,7 +11110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11269,7 +11277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12157,7 +12165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12263,7 +12271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12322,7 +12330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12543,7 +12551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12640,7 +12648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12746,7 +12754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12805,7 +12813,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12859,7 +12867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13026,7 +13034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13328,7 +13336,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13373,7 +13381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13432,7 +13440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_font_subset_staging_main.json b/recipes/engine/engine.expected/mac_font_subset_staging_main.json
index 41c30a6..0c94c71 100644
--- a/recipes/engine/engine.expected/mac_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/mac_font_subset_staging_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5605,7 +5613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5711,7 +5719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5770,7 +5778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5824,7 +5832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5991,7 +5999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6086,7 +6094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6251,7 +6259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6305,7 +6313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6472,7 +6480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6567,7 +6575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6673,7 +6681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6732,7 +6740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6786,7 +6794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6953,7 +6961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7047,7 +7055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7153,7 +7161,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7212,7 +7220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7266,7 +7274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7433,7 +7441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7528,7 +7536,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7634,7 +7642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7693,7 +7701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7747,7 +7755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7914,7 +7922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8009,7 +8017,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8115,7 +8123,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8174,7 +8182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8228,7 +8236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8395,7 +8403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8491,7 +8499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8595,7 +8603,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8708,7 +8716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8875,7 +8883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8974,7 +8982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9078,7 +9086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9137,7 +9145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9191,7 +9199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9358,7 +9366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9454,7 +9462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9558,7 +9566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9617,7 +9625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9671,7 +9679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9838,7 +9846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10232,7 +10240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10336,7 +10344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10395,7 +10403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10449,7 +10457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10616,7 +10624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10885,7 +10893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10989,7 +10997,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11048,7 +11056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11102,7 +11110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11269,7 +11277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12157,7 +12165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12263,7 +12271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12322,7 +12330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12543,7 +12551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12640,7 +12648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12746,7 +12754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12805,7 +12813,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12859,7 +12867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13026,7 +13034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13328,7 +13336,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13373,7 +13381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13432,7 +13440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_no_lto_flutter_flutter-3.8-candidate.10.json
index 8ca2df0..6a84e27 100644
--- a/recipes/engine/engine.expected/mac_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5570,7 +5578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5676,7 +5684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5735,7 +5743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5789,7 +5797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5956,7 +5964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6052,7 +6060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6158,7 +6166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6217,7 +6225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6271,7 +6279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6438,7 +6446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6534,7 +6542,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6640,7 +6648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6699,7 +6707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6753,7 +6761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7015,7 +7023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7121,7 +7129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7180,7 +7188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7234,7 +7242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7401,7 +7409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7497,7 +7505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7603,7 +7611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7662,7 +7670,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7716,7 +7724,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7883,7 +7891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7979,7 +7987,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8085,7 +8093,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8144,7 +8152,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8198,7 +8206,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8365,7 +8373,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8461,7 +8469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8565,7 +8573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8624,7 +8632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8678,7 +8686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8845,7 +8853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8944,7 +8952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9048,7 +9056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9107,7 +9115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9161,7 +9169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9328,7 +9336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9425,7 +9433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9529,7 +9537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9642,7 +9650,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9809,7 +9817,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10204,7 +10212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10308,7 +10316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10367,7 +10375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10421,7 +10429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10588,7 +10596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10858,7 +10866,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10962,7 +10970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11021,7 +11029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11075,7 +11083,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11242,7 +11250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12130,7 +12138,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12236,7 +12244,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12295,7 +12303,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12349,7 +12357,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12516,7 +12524,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12613,7 +12621,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12719,7 +12727,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12778,7 +12786,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12832,7 +12840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12999,7 +13007,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13301,7 +13309,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13346,7 +13354,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13405,7 +13413,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_no_lto_flutter_main.json b/recipes/engine/engine.expected/mac_no_lto_flutter_main.json
index 8ca2df0..6a84e27 100644
--- a/recipes/engine/engine.expected/mac_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_no_lto_flutter_main.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5570,7 +5578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5676,7 +5684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5735,7 +5743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5789,7 +5797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5956,7 +5964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6052,7 +6060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6158,7 +6166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6217,7 +6225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6271,7 +6279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6438,7 +6446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6534,7 +6542,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6640,7 +6648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6699,7 +6707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6753,7 +6761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7015,7 +7023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7121,7 +7129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7180,7 +7188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7234,7 +7242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7401,7 +7409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7497,7 +7505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7603,7 +7611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7662,7 +7670,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7716,7 +7724,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7883,7 +7891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7979,7 +7987,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8085,7 +8093,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8144,7 +8152,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8198,7 +8206,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8365,7 +8373,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8461,7 +8469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8565,7 +8573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8624,7 +8632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8678,7 +8686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8845,7 +8853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8944,7 +8952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9048,7 +9056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9107,7 +9115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9161,7 +9169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9328,7 +9336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9425,7 +9433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9529,7 +9537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9642,7 +9650,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9809,7 +9817,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10204,7 +10212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10308,7 +10316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10367,7 +10375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10421,7 +10429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10588,7 +10596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10858,7 +10866,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10962,7 +10970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11021,7 +11029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11075,7 +11083,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11242,7 +11250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12130,7 +12138,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12236,7 +12244,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12295,7 +12303,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12349,7 +12357,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12516,7 +12524,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12613,7 +12621,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12719,7 +12727,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12778,7 +12786,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12832,7 +12840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12999,7 +13007,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13301,7 +13309,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13346,7 +13354,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13405,7 +13413,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index 8ca2df0..6a84e27 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5570,7 +5578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5676,7 +5684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5735,7 +5743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5789,7 +5797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5956,7 +5964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6052,7 +6060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6158,7 +6166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6217,7 +6225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6271,7 +6279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6438,7 +6446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6534,7 +6542,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6640,7 +6648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6699,7 +6707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6753,7 +6761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7015,7 +7023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7121,7 +7129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7180,7 +7188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7234,7 +7242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7401,7 +7409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7497,7 +7505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7603,7 +7611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7662,7 +7670,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7716,7 +7724,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7883,7 +7891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7979,7 +7987,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8085,7 +8093,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8144,7 +8152,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8198,7 +8206,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8365,7 +8373,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8461,7 +8469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8565,7 +8573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8624,7 +8632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8678,7 +8686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8845,7 +8853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8944,7 +8952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9048,7 +9056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9107,7 +9115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9161,7 +9169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9328,7 +9336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9425,7 +9433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9529,7 +9537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9642,7 +9650,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9809,7 +9817,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10204,7 +10212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10308,7 +10316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10367,7 +10375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10421,7 +10429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10588,7 +10596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10858,7 +10866,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10962,7 +10970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11021,7 +11029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11075,7 +11083,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11242,7 +11250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12130,7 +12138,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12236,7 +12244,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12295,7 +12303,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12349,7 +12357,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12516,7 +12524,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12613,7 +12621,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12719,7 +12727,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12778,7 +12786,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12832,7 +12840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12999,7 +13007,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13301,7 +13309,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13346,7 +13354,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13405,7 +13413,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_main.json
index 8ca2df0..6a84e27 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_flutter_main.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5570,7 +5578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5676,7 +5684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5735,7 +5743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5789,7 +5797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5956,7 +5964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6052,7 +6060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6158,7 +6166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6217,7 +6225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6271,7 +6279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6438,7 +6446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6534,7 +6542,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6640,7 +6648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6699,7 +6707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6753,7 +6761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7015,7 +7023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7121,7 +7129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7180,7 +7188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7234,7 +7242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7401,7 +7409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7497,7 +7505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7603,7 +7611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7662,7 +7670,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7716,7 +7724,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7883,7 +7891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7979,7 +7987,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8085,7 +8093,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8144,7 +8152,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8198,7 +8206,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8365,7 +8373,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8461,7 +8469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8565,7 +8573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8624,7 +8632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8678,7 +8686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8845,7 +8853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8944,7 +8952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9048,7 +9056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9107,7 +9115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9161,7 +9169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9328,7 +9336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9425,7 +9433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9529,7 +9537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9642,7 +9650,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9809,7 +9817,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10204,7 +10212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10308,7 +10316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10367,7 +10375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10421,7 +10429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10588,7 +10596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10858,7 +10866,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10962,7 +10970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11021,7 +11029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11075,7 +11083,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11242,7 +11250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12130,7 +12138,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12236,7 +12244,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12295,7 +12303,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12349,7 +12357,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12516,7 +12524,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12613,7 +12621,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12719,7 +12727,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12778,7 +12786,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12832,7 +12840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12999,7 +13007,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13301,7 +13309,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13346,7 +13354,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13405,7 +13413,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
index c50e4b5..30a5c0d 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5606,7 +5614,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5771,7 +5779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5825,7 +5833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5992,7 +6000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6088,7 +6096,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6194,7 +6202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6253,7 +6261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6307,7 +6315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6474,7 +6482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6570,7 +6578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6676,7 +6684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6735,7 +6743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6789,7 +6797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6956,7 +6964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7157,7 +7165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7216,7 +7224,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7270,7 +7278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7437,7 +7445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7533,7 +7541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7639,7 +7647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7698,7 +7706,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7752,7 +7760,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7919,7 +7927,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8015,7 +8023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8121,7 +8129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8180,7 +8188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8234,7 +8242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8401,7 +8409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8497,7 +8505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8601,7 +8609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8660,7 +8668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8714,7 +8722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8881,7 +8889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8980,7 +8988,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9084,7 +9092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9143,7 +9151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9364,7 +9372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9461,7 +9469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9565,7 +9573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9678,7 +9686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9845,7 +9853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10240,7 +10248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10344,7 +10352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10403,7 +10411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10457,7 +10465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10624,7 +10632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10894,7 +10902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10998,7 +11006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11057,7 +11065,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11111,7 +11119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11278,7 +11286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12166,7 +12174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12272,7 +12280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12331,7 +12339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12385,7 +12393,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12552,7 +12560,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12649,7 +12657,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12755,7 +12763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12814,7 +12822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12868,7 +12876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13035,7 +13043,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13337,7 +13345,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13382,7 +13390,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13441,7 +13449,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_main.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_main.json
index a98cd3d..c11523c 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_prod_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5606,7 +5614,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5771,7 +5779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5825,7 +5833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5992,7 +6000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6088,7 +6096,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6194,7 +6202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6253,7 +6261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6307,7 +6315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6474,7 +6482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6570,7 +6578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6676,7 +6684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6735,7 +6743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6789,7 +6797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6956,7 +6964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7157,7 +7165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7216,7 +7224,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7270,7 +7278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7437,7 +7445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7533,7 +7541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7639,7 +7647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7698,7 +7706,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7752,7 +7760,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7919,7 +7927,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8015,7 +8023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8121,7 +8129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8180,7 +8188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8234,7 +8242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8401,7 +8409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8497,7 +8505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8601,7 +8609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8660,7 +8668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8714,7 +8722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8881,7 +8889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8980,7 +8988,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9084,7 +9092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9143,7 +9151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9364,7 +9372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9461,7 +9469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9565,7 +9573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9678,7 +9686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9845,7 +9853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10240,7 +10248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10344,7 +10352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10403,7 +10411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10457,7 +10465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10624,7 +10632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10894,7 +10902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10998,7 +11006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11057,7 +11065,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11111,7 +11119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11278,7 +11286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12166,7 +12174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12272,7 +12280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12331,7 +12339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12385,7 +12393,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12552,7 +12560,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12649,7 +12657,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12755,7 +12763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12814,7 +12822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12868,7 +12876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13035,7 +13043,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13337,7 +13345,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13382,7 +13390,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13441,7 +13449,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
index 17ba9d9..0eef5d2 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5606,7 +5614,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5771,7 +5779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5825,7 +5833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5992,7 +6000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6088,7 +6096,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6194,7 +6202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6253,7 +6261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6307,7 +6315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6474,7 +6482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6570,7 +6578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6676,7 +6684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6735,7 +6743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6789,7 +6797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6956,7 +6964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7157,7 +7165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7216,7 +7224,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7270,7 +7278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7437,7 +7445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7533,7 +7541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7639,7 +7647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7698,7 +7706,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7752,7 +7760,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7919,7 +7927,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8015,7 +8023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8121,7 +8129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8180,7 +8188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8234,7 +8242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8401,7 +8409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8497,7 +8505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8601,7 +8609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8660,7 +8668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8714,7 +8722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8881,7 +8889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8980,7 +8988,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9084,7 +9092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9143,7 +9151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9364,7 +9372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9461,7 +9469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9565,7 +9573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9678,7 +9686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9845,7 +9853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10240,7 +10248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10344,7 +10352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10403,7 +10411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10457,7 +10465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10624,7 +10632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10894,7 +10902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10998,7 +11006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11057,7 +11065,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11111,7 +11119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11278,7 +11286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12166,7 +12174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12272,7 +12280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12331,7 +12339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12385,7 +12393,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12552,7 +12560,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12649,7 +12657,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12755,7 +12763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12814,7 +12822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12868,7 +12876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13035,7 +13043,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13337,7 +13345,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13382,7 +13390,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13441,7 +13449,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_main.json b/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_main.json
index d49d7f2..f45af13 100644
--- a/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/mac_no_lto_font_subset_staging_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5606,7 +5614,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5771,7 +5779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5825,7 +5833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5992,7 +6000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6088,7 +6096,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6194,7 +6202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6253,7 +6261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6307,7 +6315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6474,7 +6482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6570,7 +6578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6676,7 +6684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6735,7 +6743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6789,7 +6797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6956,7 +6964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7157,7 +7165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7216,7 +7224,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7270,7 +7278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7437,7 +7445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7533,7 +7541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7639,7 +7647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7698,7 +7706,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7752,7 +7760,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7919,7 +7927,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8015,7 +8023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8121,7 +8129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8180,7 +8188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8234,7 +8242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8401,7 +8409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8497,7 +8505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8601,7 +8609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8660,7 +8668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8714,7 +8722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8881,7 +8889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8980,7 +8988,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9084,7 +9092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9143,7 +9151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9364,7 +9372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9461,7 +9469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9565,7 +9573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9678,7 +9686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9845,7 +9853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10240,7 +10248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10344,7 +10352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10403,7 +10411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10457,7 +10465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10624,7 +10632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10894,7 +10902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10998,7 +11006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11057,7 +11065,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11111,7 +11119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11278,7 +11286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12166,7 +12174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12272,7 +12280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12331,7 +12339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12385,7 +12393,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12552,7 +12560,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12649,7 +12657,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12755,7 +12763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12814,7 +12822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12868,7 +12876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13035,7 +13043,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13337,7 +13345,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13382,7 +13390,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13441,7 +13449,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_no_lto_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_no_lto_prod_flutter-3.8-candidate.10.json
index c50e4b5..30a5c0d 100644
--- a/recipes/engine/engine.expected/mac_no_lto_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_no_lto_prod_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5606,7 +5614,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5771,7 +5779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5825,7 +5833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5992,7 +6000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6088,7 +6096,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6194,7 +6202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6253,7 +6261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6307,7 +6315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6474,7 +6482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6570,7 +6578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6676,7 +6684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6735,7 +6743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6789,7 +6797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6956,7 +6964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7157,7 +7165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7216,7 +7224,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7270,7 +7278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7437,7 +7445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7533,7 +7541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7639,7 +7647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7698,7 +7706,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7752,7 +7760,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7919,7 +7927,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8015,7 +8023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8121,7 +8129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8180,7 +8188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8234,7 +8242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8401,7 +8409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8497,7 +8505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8601,7 +8609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8660,7 +8668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8714,7 +8722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8881,7 +8889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8980,7 +8988,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9084,7 +9092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9143,7 +9151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9364,7 +9372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9461,7 +9469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9565,7 +9573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9678,7 +9686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9845,7 +9853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10240,7 +10248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10344,7 +10352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10403,7 +10411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10457,7 +10465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10624,7 +10632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10894,7 +10902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10998,7 +11006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11057,7 +11065,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11111,7 +11119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11278,7 +11286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12166,7 +12174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12272,7 +12280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12331,7 +12339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12385,7 +12393,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12552,7 +12560,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12649,7 +12657,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12755,7 +12763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12814,7 +12822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12868,7 +12876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13035,7 +13043,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13337,7 +13345,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13382,7 +13390,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13441,7 +13449,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_no_lto_prod_main.json b/recipes/engine/engine.expected/mac_no_lto_prod_main.json
index a98cd3d..c11523c 100644
--- a/recipes/engine/engine.expected/mac_no_lto_prod_main.json
+++ b/recipes/engine/engine.expected/mac_no_lto_prod_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5606,7 +5614,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5771,7 +5779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5825,7 +5833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5992,7 +6000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6088,7 +6096,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6194,7 +6202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6253,7 +6261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6307,7 +6315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6474,7 +6482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6570,7 +6578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6676,7 +6684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6735,7 +6743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6789,7 +6797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6956,7 +6964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7157,7 +7165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7216,7 +7224,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7270,7 +7278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7437,7 +7445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7533,7 +7541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7639,7 +7647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7698,7 +7706,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7752,7 +7760,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7919,7 +7927,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8015,7 +8023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8121,7 +8129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8180,7 +8188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8234,7 +8242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8401,7 +8409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8497,7 +8505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8601,7 +8609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8660,7 +8668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8714,7 +8722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8881,7 +8889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8980,7 +8988,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9084,7 +9092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9143,7 +9151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9364,7 +9372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9461,7 +9469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9565,7 +9573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9678,7 +9686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9845,7 +9853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10240,7 +10248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10344,7 +10352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10403,7 +10411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10457,7 +10465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10624,7 +10632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10894,7 +10902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10998,7 +11006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11057,7 +11065,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11111,7 +11119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11278,7 +11286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12166,7 +12174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12272,7 +12280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12331,7 +12339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12385,7 +12393,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12552,7 +12560,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12649,7 +12657,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12755,7 +12763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12814,7 +12822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12868,7 +12876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13035,7 +13043,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13337,7 +13345,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13382,7 +13390,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13441,7 +13449,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_no_lto_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_no_lto_staging_flutter-3.8-candidate.10.json
index 17ba9d9..0eef5d2 100644
--- a/recipes/engine/engine.expected/mac_no_lto_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_no_lto_staging_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5606,7 +5614,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5771,7 +5779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5825,7 +5833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5992,7 +6000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6088,7 +6096,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6194,7 +6202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6253,7 +6261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6307,7 +6315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6474,7 +6482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6570,7 +6578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6676,7 +6684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6735,7 +6743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6789,7 +6797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6956,7 +6964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7157,7 +7165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7216,7 +7224,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7270,7 +7278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7437,7 +7445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7533,7 +7541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7639,7 +7647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7698,7 +7706,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7752,7 +7760,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7919,7 +7927,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8015,7 +8023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8121,7 +8129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8180,7 +8188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8234,7 +8242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8401,7 +8409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8497,7 +8505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8601,7 +8609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8660,7 +8668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8714,7 +8722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8881,7 +8889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8980,7 +8988,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9084,7 +9092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9143,7 +9151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9364,7 +9372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9461,7 +9469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9565,7 +9573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9678,7 +9686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9845,7 +9853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10240,7 +10248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10344,7 +10352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10403,7 +10411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10457,7 +10465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10624,7 +10632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10894,7 +10902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10998,7 +11006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11057,7 +11065,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11111,7 +11119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11278,7 +11286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12166,7 +12174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12272,7 +12280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12331,7 +12339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12385,7 +12393,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12552,7 +12560,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12649,7 +12657,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12755,7 +12763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12814,7 +12822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12868,7 +12876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13035,7 +13043,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13337,7 +13345,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13382,7 +13390,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13441,7 +13449,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_no_lto_staging_main.json b/recipes/engine/engine.expected/mac_no_lto_staging_main.json
index d49d7f2..f45af13 100644
--- a/recipes/engine/engine.expected/mac_no_lto_staging_main.json
+++ b/recipes/engine/engine.expected/mac_no_lto_staging_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5606,7 +5614,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5771,7 +5779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5825,7 +5833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5992,7 +6000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6088,7 +6096,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6194,7 +6202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6253,7 +6261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6307,7 +6315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6474,7 +6482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6570,7 +6578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6676,7 +6684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6735,7 +6743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6789,7 +6797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6956,7 +6964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7157,7 +7165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7216,7 +7224,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7270,7 +7278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7437,7 +7445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7533,7 +7541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7639,7 +7647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7698,7 +7706,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7752,7 +7760,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7919,7 +7927,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8015,7 +8023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8121,7 +8129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8180,7 +8188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8234,7 +8242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8401,7 +8409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8497,7 +8505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8601,7 +8609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8660,7 +8668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8714,7 +8722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8881,7 +8889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8980,7 +8988,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9084,7 +9092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9143,7 +9151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9364,7 +9372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9461,7 +9469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9565,7 +9573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9678,7 +9686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9845,7 +9853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10240,7 +10248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10344,7 +10352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10403,7 +10411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10457,7 +10465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10624,7 +10632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10894,7 +10902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10998,7 +11006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11057,7 +11065,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11111,7 +11119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11278,7 +11286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12166,7 +12174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12272,7 +12280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12331,7 +12339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12385,7 +12393,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12552,7 +12560,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12649,7 +12657,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12755,7 +12763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12814,7 +12822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12868,7 +12876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13035,7 +13043,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13337,7 +13345,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13382,7 +13390,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13441,7 +13449,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_prod_flutter-3.8-candidate.10.json
index 09360e8..9cd06b7 100644
--- a/recipes/engine/engine.expected/mac_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_prod_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5605,7 +5613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5711,7 +5719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5770,7 +5778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5824,7 +5832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5991,7 +5999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6086,7 +6094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6251,7 +6259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6305,7 +6313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6472,7 +6480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6567,7 +6575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6673,7 +6681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6732,7 +6740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6786,7 +6794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6953,7 +6961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7047,7 +7055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7153,7 +7161,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7212,7 +7220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7266,7 +7274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7433,7 +7441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7528,7 +7536,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7634,7 +7642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7693,7 +7701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7747,7 +7755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7914,7 +7922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8009,7 +8017,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8115,7 +8123,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8174,7 +8182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8228,7 +8236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8395,7 +8403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8491,7 +8499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8595,7 +8603,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8708,7 +8716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8875,7 +8883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8974,7 +8982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9078,7 +9086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9137,7 +9145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9191,7 +9199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9358,7 +9366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9454,7 +9462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9558,7 +9566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9617,7 +9625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9671,7 +9679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9838,7 +9846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10232,7 +10240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10336,7 +10344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10395,7 +10403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10449,7 +10457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10616,7 +10624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10885,7 +10893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10989,7 +10997,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11048,7 +11056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11102,7 +11110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11269,7 +11277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12157,7 +12165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12263,7 +12271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12322,7 +12330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12543,7 +12551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12640,7 +12648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12746,7 +12754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12805,7 +12813,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12859,7 +12867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13026,7 +13034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13328,7 +13336,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13373,7 +13381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13432,7 +13440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_prod_main.json b/recipes/engine/engine.expected/mac_prod_main.json
index a0d6704..e47c20d 100644
--- a/recipes/engine/engine.expected/mac_prod_main.json
+++ b/recipes/engine/engine.expected/mac_prod_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5605,7 +5613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5711,7 +5719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5770,7 +5778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5824,7 +5832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5991,7 +5999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6086,7 +6094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6251,7 +6259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6305,7 +6313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6472,7 +6480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6567,7 +6575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6673,7 +6681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6732,7 +6740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6786,7 +6794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6953,7 +6961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7047,7 +7055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7153,7 +7161,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7212,7 +7220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7266,7 +7274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7433,7 +7441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7528,7 +7536,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7634,7 +7642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7693,7 +7701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7747,7 +7755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7914,7 +7922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8009,7 +8017,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8115,7 +8123,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8174,7 +8182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8228,7 +8236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8395,7 +8403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8491,7 +8499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8595,7 +8603,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8708,7 +8716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8875,7 +8883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8974,7 +8982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9078,7 +9086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9137,7 +9145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9191,7 +9199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9358,7 +9366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9454,7 +9462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9558,7 +9566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9617,7 +9625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9671,7 +9679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9838,7 +9846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10232,7 +10240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10336,7 +10344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10395,7 +10403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10449,7 +10457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10616,7 +10624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10885,7 +10893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10989,7 +10997,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11048,7 +11056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11102,7 +11110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11269,7 +11277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12157,7 +12165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12263,7 +12271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12322,7 +12330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12543,7 +12551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12640,7 +12648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12746,7 +12754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12805,7 +12813,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12859,7 +12867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13026,7 +13034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13328,7 +13336,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13373,7 +13381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13432,7 +13440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_staging_flutter-3.8-candidate.10.json
index 88c0994..dfb3c30 100644
--- a/recipes/engine/engine.expected/mac_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_staging_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5605,7 +5613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5711,7 +5719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5770,7 +5778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5824,7 +5832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5991,7 +5999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6086,7 +6094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6251,7 +6259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6305,7 +6313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6472,7 +6480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6567,7 +6575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6673,7 +6681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6732,7 +6740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6786,7 +6794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6953,7 +6961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7047,7 +7055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7153,7 +7161,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7212,7 +7220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7266,7 +7274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7433,7 +7441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7528,7 +7536,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7634,7 +7642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7693,7 +7701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7747,7 +7755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7914,7 +7922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8009,7 +8017,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8115,7 +8123,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8174,7 +8182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8228,7 +8236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8395,7 +8403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8491,7 +8499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8595,7 +8603,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8708,7 +8716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8875,7 +8883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8974,7 +8982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9078,7 +9086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9137,7 +9145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9191,7 +9199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9358,7 +9366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9454,7 +9462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9558,7 +9566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9617,7 +9625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9671,7 +9679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9838,7 +9846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10232,7 +10240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10336,7 +10344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10395,7 +10403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10449,7 +10457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10616,7 +10624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10885,7 +10893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10989,7 +10997,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11048,7 +11056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11102,7 +11110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11269,7 +11277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12157,7 +12165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12263,7 +12271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12322,7 +12330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12543,7 +12551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12640,7 +12648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12746,7 +12754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12805,7 +12813,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12859,7 +12867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13026,7 +13034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13328,7 +13336,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13373,7 +13381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13432,7 +13440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_staging_main.json b/recipes/engine/engine.expected/mac_staging_main.json
index 41c30a6..0c94c71 100644
--- a/recipes/engine/engine.expected/mac_staging_main.json
+++ b/recipes/engine/engine.expected/mac_staging_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5605,7 +5613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5711,7 +5719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5770,7 +5778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5824,7 +5832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5991,7 +5999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6086,7 +6094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6251,7 +6259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6305,7 +6313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6472,7 +6480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6567,7 +6575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6673,7 +6681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6732,7 +6740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6786,7 +6794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6953,7 +6961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7047,7 +7055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7153,7 +7161,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7212,7 +7220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7266,7 +7274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7433,7 +7441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7528,7 +7536,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7634,7 +7642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7693,7 +7701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7747,7 +7755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7914,7 +7922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8009,7 +8017,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8115,7 +8123,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8174,7 +8182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8228,7 +8236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8395,7 +8403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8491,7 +8499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8595,7 +8603,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8708,7 +8716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8875,7 +8883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8974,7 +8982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9078,7 +9086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9137,7 +9145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9191,7 +9199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9358,7 +9366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9454,7 +9462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9558,7 +9566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9617,7 +9625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9671,7 +9679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9838,7 +9846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10232,7 +10240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10336,7 +10344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10395,7 +10403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10449,7 +10457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10616,7 +10624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10885,7 +10893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10989,7 +10997,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11048,7 +11056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11102,7 +11110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11269,7 +11277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12157,7 +12165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12263,7 +12271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12322,7 +12330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12543,7 +12551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12640,7 +12648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12746,7 +12754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12805,7 +12813,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12859,7 +12867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13026,7 +13034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13328,7 +13336,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13373,7 +13381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13432,7 +13440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_flutter_flutter-3.8-candidate.10.json
index 7b19924..48921e3 100644
--- a/recipes/engine/engine.expected/mac_upload_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_flutter_flutter-3.8-candidate.10.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5734,7 +5742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5788,7 +5796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5955,7 +5963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6050,7 +6058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6156,7 +6164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6215,7 +6223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6269,7 +6277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6436,7 +6444,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6531,7 +6539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6637,7 +6645,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6696,7 +6704,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6750,7 +6758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6917,7 +6925,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7011,7 +7019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7117,7 +7125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7176,7 +7184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7230,7 +7238,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7397,7 +7405,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7492,7 +7500,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7598,7 +7606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7657,7 +7665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7711,7 +7719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7878,7 +7886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7973,7 +7981,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8079,7 +8087,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8138,7 +8146,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8192,7 +8200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8359,7 +8367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8455,7 +8463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8559,7 +8567,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8618,7 +8626,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8672,7 +8680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8839,7 +8847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8938,7 +8946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9042,7 +9050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9101,7 +9109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9155,7 +9163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9322,7 +9330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9418,7 +9426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9522,7 +9530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9581,7 +9589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9635,7 +9643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9802,7 +9810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10196,7 +10204,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10300,7 +10308,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10359,7 +10367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10413,7 +10421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10580,7 +10588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10849,7 +10857,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10953,7 +10961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11012,7 +11020,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11066,7 +11074,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11233,7 +11241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12121,7 +12129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12227,7 +12235,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12286,7 +12294,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12340,7 +12348,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12507,7 +12515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12604,7 +12612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12710,7 +12718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12769,7 +12777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12823,7 +12831,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12990,7 +12998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13292,7 +13300,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13337,7 +13345,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13396,7 +13404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_flutter_main.json b/recipes/engine/engine.expected/mac_upload_flutter_main.json
index 7b19924..48921e3 100644
--- a/recipes/engine/engine.expected/mac_upload_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_upload_flutter_main.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5734,7 +5742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5788,7 +5796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5955,7 +5963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6050,7 +6058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6156,7 +6164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6215,7 +6223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6269,7 +6277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6436,7 +6444,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6531,7 +6539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6637,7 +6645,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6696,7 +6704,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6750,7 +6758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6917,7 +6925,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7011,7 +7019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7117,7 +7125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7176,7 +7184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7230,7 +7238,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7397,7 +7405,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7492,7 +7500,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7598,7 +7606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7657,7 +7665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7711,7 +7719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7878,7 +7886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7973,7 +7981,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8079,7 +8087,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8138,7 +8146,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8192,7 +8200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8359,7 +8367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8455,7 +8463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8559,7 +8567,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8618,7 +8626,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8672,7 +8680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8839,7 +8847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8938,7 +8946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9042,7 +9050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9101,7 +9109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9155,7 +9163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9322,7 +9330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9418,7 +9426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9522,7 +9530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9581,7 +9589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9635,7 +9643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9802,7 +9810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10196,7 +10204,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10300,7 +10308,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10359,7 +10367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10413,7 +10421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10580,7 +10588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10849,7 +10857,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10953,7 +10961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11012,7 +11020,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11066,7 +11074,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11233,7 +11241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12121,7 +12129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12227,7 +12235,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12286,7 +12294,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12340,7 +12348,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12507,7 +12515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12604,7 +12612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12710,7 +12718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12769,7 +12777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12823,7 +12831,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12990,7 +12998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13292,7 +13300,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13337,7 +13345,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13396,7 +13404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_font_subset_flutter_flutter-3.8-candidate.10.json
index 7b19924..48921e3 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5734,7 +5742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5788,7 +5796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5955,7 +5963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6050,7 +6058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6156,7 +6164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6215,7 +6223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6269,7 +6277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6436,7 +6444,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6531,7 +6539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6637,7 +6645,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6696,7 +6704,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6750,7 +6758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6917,7 +6925,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7011,7 +7019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7117,7 +7125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7176,7 +7184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7230,7 +7238,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7397,7 +7405,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7492,7 +7500,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7598,7 +7606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7657,7 +7665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7711,7 +7719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7878,7 +7886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7973,7 +7981,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8079,7 +8087,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8138,7 +8146,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8192,7 +8200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8359,7 +8367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8455,7 +8463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8559,7 +8567,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8618,7 +8626,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8672,7 +8680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8839,7 +8847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8938,7 +8946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9042,7 +9050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9101,7 +9109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9155,7 +9163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9322,7 +9330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9418,7 +9426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9522,7 +9530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9581,7 +9589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9635,7 +9643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9802,7 +9810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10196,7 +10204,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10300,7 +10308,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10359,7 +10367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10413,7 +10421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10580,7 +10588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10849,7 +10857,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10953,7 +10961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11012,7 +11020,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11066,7 +11074,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11233,7 +11241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12121,7 +12129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12227,7 +12235,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12286,7 +12294,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12340,7 +12348,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12507,7 +12515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12604,7 +12612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12710,7 +12718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12769,7 +12777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12823,7 +12831,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12990,7 +12998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13292,7 +13300,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13337,7 +13345,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13396,7 +13404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_flutter_main.json b/recipes/engine/engine.expected/mac_upload_font_subset_flutter_main.json
index 7b19924..48921e3 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_flutter_main.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5675,7 +5683,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5734,7 +5742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5788,7 +5796,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5955,7 +5963,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6050,7 +6058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6156,7 +6164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6215,7 +6223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6269,7 +6277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6436,7 +6444,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6531,7 +6539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6637,7 +6645,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6696,7 +6704,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6750,7 +6758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6917,7 +6925,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7011,7 +7019,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7117,7 +7125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7176,7 +7184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7230,7 +7238,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7397,7 +7405,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7492,7 +7500,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7598,7 +7606,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7657,7 +7665,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7711,7 +7719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7878,7 +7886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7973,7 +7981,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8079,7 +8087,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8138,7 +8146,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8192,7 +8200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8359,7 +8367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8455,7 +8463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8559,7 +8567,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8618,7 +8626,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8672,7 +8680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8839,7 +8847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8938,7 +8946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9042,7 +9050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9101,7 +9109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9155,7 +9163,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9322,7 +9330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9418,7 +9426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9522,7 +9530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9581,7 +9589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9635,7 +9643,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9802,7 +9810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10196,7 +10204,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10300,7 +10308,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10359,7 +10367,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10413,7 +10421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10580,7 +10588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10849,7 +10857,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10953,7 +10961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11012,7 +11020,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11066,7 +11074,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11233,7 +11241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12121,7 +12129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12227,7 +12235,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12286,7 +12294,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12340,7 +12348,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12507,7 +12515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12604,7 +12612,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12710,7 +12718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12769,7 +12777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12823,7 +12831,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12990,7 +12998,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13292,7 +13300,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13337,7 +13345,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13396,7 +13404,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_font_subset_prod_flutter-3.8-candidate.10.json
index 55925bd..c9f138f 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_prod_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -6505,7 +6513,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6611,7 +6619,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6670,7 +6678,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6724,7 +6732,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6891,7 +6899,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -7036,7 +7044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7142,7 +7150,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7201,7 +7209,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7255,7 +7263,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7422,7 +7430,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -7567,7 +7575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7673,7 +7681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7732,7 +7740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7786,7 +7794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7953,7 +7961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -8097,7 +8105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8203,7 +8211,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8262,7 +8270,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8316,7 +8324,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8483,7 +8491,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8628,7 +8636,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8734,7 +8742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8793,7 +8801,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8847,7 +8855,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9014,7 +9022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9159,7 +9167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9265,7 +9273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9324,7 +9332,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9378,7 +9386,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9545,7 +9553,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9691,7 +9699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9795,7 +9803,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9854,7 +9862,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9908,7 +9916,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10075,7 +10083,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -10174,7 +10182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10278,7 +10286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10337,7 +10345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10391,7 +10399,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10558,7 +10566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -10654,7 +10662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10758,7 +10766,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10817,7 +10825,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10871,7 +10879,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11038,7 +11046,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -11532,7 +11540,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -11636,7 +11644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11695,7 +11703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11749,7 +11757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11916,7 +11924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -12235,7 +12243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12339,7 +12347,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12398,7 +12406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12452,7 +12460,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12619,7 +12627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -13607,7 +13615,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -13713,7 +13721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -13772,7 +13780,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -13826,7 +13834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13993,7 +14001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -14090,7 +14098,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14196,7 +14204,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14255,7 +14263,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14309,7 +14317,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14476,7 +14484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -14778,7 +14786,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14823,7 +14831,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -14882,7 +14890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_prod_main.json b/recipes/engine/engine.expected/mac_upload_font_subset_prod_main.json
index ca972c4..9a03cda 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_prod_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -6505,7 +6513,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6611,7 +6619,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6670,7 +6678,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6724,7 +6732,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6891,7 +6899,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -7036,7 +7044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7142,7 +7150,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7201,7 +7209,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7255,7 +7263,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7422,7 +7430,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -7567,7 +7575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7673,7 +7681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7732,7 +7740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7786,7 +7794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7953,7 +7961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -8097,7 +8105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8203,7 +8211,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8262,7 +8270,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8316,7 +8324,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8483,7 +8491,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8628,7 +8636,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8734,7 +8742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8793,7 +8801,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8847,7 +8855,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9014,7 +9022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9159,7 +9167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9265,7 +9273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9324,7 +9332,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9378,7 +9386,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9545,7 +9553,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9691,7 +9699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9795,7 +9803,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9854,7 +9862,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9908,7 +9916,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10075,7 +10083,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -10174,7 +10182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10278,7 +10286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10337,7 +10345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10391,7 +10399,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10558,7 +10566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -10654,7 +10662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10758,7 +10766,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10817,7 +10825,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10871,7 +10879,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11038,7 +11046,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -11532,7 +11540,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -11636,7 +11644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11695,7 +11703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11749,7 +11757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11916,7 +11924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -12235,7 +12243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12339,7 +12347,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12398,7 +12406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12452,7 +12460,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12619,7 +12627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -13607,7 +13615,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -13713,7 +13721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -13772,7 +13780,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -13826,7 +13834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13993,7 +14001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -14090,7 +14098,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14196,7 +14204,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14255,7 +14263,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14309,7 +14317,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14476,7 +14484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -14778,7 +14786,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14823,7 +14831,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -14882,7 +14890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_font_subset_staging_flutter-3.8-candidate.10.json
index 7d8ba03..38e3d31 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_staging_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5605,7 +5613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5711,7 +5719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5770,7 +5778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5824,7 +5832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5991,7 +5999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6086,7 +6094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6251,7 +6259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6305,7 +6313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6472,7 +6480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6567,7 +6575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6673,7 +6681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6732,7 +6740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6786,7 +6794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6953,7 +6961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7047,7 +7055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7153,7 +7161,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7212,7 +7220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7266,7 +7274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7433,7 +7441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7528,7 +7536,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7634,7 +7642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7693,7 +7701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7747,7 +7755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7914,7 +7922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8009,7 +8017,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8115,7 +8123,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8174,7 +8182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8228,7 +8236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8395,7 +8403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8491,7 +8499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8595,7 +8603,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8708,7 +8716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8875,7 +8883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8974,7 +8982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9078,7 +9086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9137,7 +9145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9191,7 +9199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9358,7 +9366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9454,7 +9462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9558,7 +9566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9617,7 +9625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9671,7 +9679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9838,7 +9846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10232,7 +10240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10336,7 +10344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10395,7 +10403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10449,7 +10457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10616,7 +10624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10885,7 +10893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10989,7 +10997,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11048,7 +11056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11102,7 +11110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11269,7 +11277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12157,7 +12165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12263,7 +12271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12322,7 +12330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12543,7 +12551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12640,7 +12648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12746,7 +12754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12805,7 +12813,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12859,7 +12867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13026,7 +13034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13328,7 +13336,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13373,7 +13381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13432,7 +13440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_font_subset_staging_main.json b/recipes/engine/engine.expected/mac_upload_font_subset_staging_main.json
index b2bd33c..3c98bbb 100644
--- a/recipes/engine/engine.expected/mac_upload_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/mac_upload_font_subset_staging_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5605,7 +5613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5711,7 +5719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5770,7 +5778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5824,7 +5832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5991,7 +5999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6086,7 +6094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6251,7 +6259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6305,7 +6313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6472,7 +6480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6567,7 +6575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6673,7 +6681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6732,7 +6740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6786,7 +6794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6953,7 +6961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7047,7 +7055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7153,7 +7161,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7212,7 +7220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7266,7 +7274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7433,7 +7441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7528,7 +7536,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7634,7 +7642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7693,7 +7701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7747,7 +7755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7914,7 +7922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8009,7 +8017,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8115,7 +8123,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8174,7 +8182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8228,7 +8236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8395,7 +8403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8491,7 +8499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8595,7 +8603,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8708,7 +8716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8875,7 +8883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8974,7 +8982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9078,7 +9086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9137,7 +9145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9191,7 +9199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9358,7 +9366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9454,7 +9462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9558,7 +9566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9617,7 +9625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9671,7 +9679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9838,7 +9846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10232,7 +10240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10336,7 +10344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10395,7 +10403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10449,7 +10457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10616,7 +10624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10885,7 +10893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10989,7 +10997,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11048,7 +11056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11102,7 +11110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11269,7 +11277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12157,7 +12165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12263,7 +12271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12322,7 +12330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12543,7 +12551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12640,7 +12648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12746,7 +12754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12805,7 +12813,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12859,7 +12867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13026,7 +13034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13328,7 +13336,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13373,7 +13381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13432,7 +13440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_no_lto_flutter_flutter-3.8-candidate.10.json
index 972f5d4..79246bb 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5570,7 +5578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5676,7 +5684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5735,7 +5743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5789,7 +5797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5956,7 +5964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6052,7 +6060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6158,7 +6166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6217,7 +6225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6271,7 +6279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6438,7 +6446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6534,7 +6542,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6640,7 +6648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6699,7 +6707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6753,7 +6761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7015,7 +7023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7121,7 +7129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7180,7 +7188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7234,7 +7242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7401,7 +7409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7497,7 +7505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7603,7 +7611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7662,7 +7670,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7716,7 +7724,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7883,7 +7891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7979,7 +7987,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8085,7 +8093,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8144,7 +8152,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8198,7 +8206,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8365,7 +8373,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8461,7 +8469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8565,7 +8573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8624,7 +8632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8678,7 +8686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8845,7 +8853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8944,7 +8952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9048,7 +9056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9107,7 +9115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9161,7 +9169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9328,7 +9336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9425,7 +9433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9529,7 +9537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9642,7 +9650,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9809,7 +9817,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10204,7 +10212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10308,7 +10316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10367,7 +10375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10421,7 +10429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10588,7 +10596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10858,7 +10866,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10962,7 +10970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11021,7 +11029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11075,7 +11083,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11242,7 +11250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12130,7 +12138,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12236,7 +12244,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12295,7 +12303,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12349,7 +12357,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12516,7 +12524,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12613,7 +12621,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12719,7 +12727,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12778,7 +12786,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12832,7 +12840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12999,7 +13007,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13301,7 +13309,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13346,7 +13354,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13405,7 +13413,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_flutter_main.json b/recipes/engine/engine.expected/mac_upload_no_lto_flutter_main.json
index 972f5d4..79246bb 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_flutter_main.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5570,7 +5578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5676,7 +5684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5735,7 +5743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5789,7 +5797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5956,7 +5964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6052,7 +6060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6158,7 +6166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6217,7 +6225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6271,7 +6279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6438,7 +6446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6534,7 +6542,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6640,7 +6648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6699,7 +6707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6753,7 +6761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7015,7 +7023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7121,7 +7129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7180,7 +7188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7234,7 +7242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7401,7 +7409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7497,7 +7505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7603,7 +7611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7662,7 +7670,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7716,7 +7724,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7883,7 +7891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7979,7 +7987,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8085,7 +8093,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8144,7 +8152,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8198,7 +8206,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8365,7 +8373,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8461,7 +8469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8565,7 +8573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8624,7 +8632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8678,7 +8686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8845,7 +8853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8944,7 +8952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9048,7 +9056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9107,7 +9115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9161,7 +9169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9328,7 +9336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9425,7 +9433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9529,7 +9537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9642,7 +9650,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9809,7 +9817,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10204,7 +10212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10308,7 +10316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10367,7 +10375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10421,7 +10429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10588,7 +10596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10858,7 +10866,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10962,7 +10970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11021,7 +11029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11075,7 +11083,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11242,7 +11250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12130,7 +12138,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12236,7 +12244,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12295,7 +12303,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12349,7 +12357,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12516,7 +12524,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12613,7 +12621,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12719,7 +12727,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12778,7 +12786,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12832,7 +12840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12999,7 +13007,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13301,7 +13309,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13346,7 +13354,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13405,7 +13413,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index 972f5d4..79246bb 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5570,7 +5578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5676,7 +5684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5735,7 +5743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5789,7 +5797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5956,7 +5964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6052,7 +6060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6158,7 +6166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6217,7 +6225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6271,7 +6279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6438,7 +6446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6534,7 +6542,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6640,7 +6648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6699,7 +6707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6753,7 +6761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7015,7 +7023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7121,7 +7129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7180,7 +7188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7234,7 +7242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7401,7 +7409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7497,7 +7505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7603,7 +7611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7662,7 +7670,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7716,7 +7724,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7883,7 +7891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7979,7 +7987,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8085,7 +8093,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8144,7 +8152,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8198,7 +8206,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8365,7 +8373,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8461,7 +8469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8565,7 +8573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8624,7 +8632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8678,7 +8686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8845,7 +8853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8944,7 +8952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9048,7 +9056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9107,7 +9115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9161,7 +9169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9328,7 +9336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9425,7 +9433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9529,7 +9537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9642,7 +9650,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9809,7 +9817,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10204,7 +10212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10308,7 +10316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10367,7 +10375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10421,7 +10429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10588,7 +10596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10858,7 +10866,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10962,7 +10970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11021,7 +11029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11075,7 +11083,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11242,7 +11250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12130,7 +12138,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12236,7 +12244,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12295,7 +12303,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12349,7 +12357,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12516,7 +12524,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12613,7 +12621,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12719,7 +12727,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12778,7 +12786,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12832,7 +12840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12999,7 +13007,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13301,7 +13309,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13346,7 +13354,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13405,7 +13413,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_main.json
index 972f5d4..79246bb 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_flutter_main.json
@@ -1100,12 +1100,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1113,8 +1120,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1159,19 +1166,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1186,7 +1190,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1231,7 +1235,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1241,9 +1245,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1292,7 +1296,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1300,7 +1304,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1310,7 +1314,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1422,7 +1426,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1481,7 +1485,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1535,7 +1539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1702,12 +1706,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1715,8 +1726,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1753,19 +1764,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1780,7 +1788,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1817,7 +1825,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1827,9 +1835,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1870,7 +1878,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1878,7 +1886,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2031,7 +2039,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2140,7 +2148,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2253,7 +2261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2420,7 +2428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2563,7 +2571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2672,7 +2680,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2731,7 +2739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2785,7 +2793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2952,7 +2960,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3097,7 +3105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3206,7 +3214,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3265,7 +3273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3319,7 +3327,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3486,7 +3494,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3584,7 +3592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3690,7 +3698,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3803,7 +3811,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3970,7 +3978,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4068,7 +4076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4174,7 +4182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4233,7 +4241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4287,7 +4295,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4454,7 +4462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5570,7 +5578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5676,7 +5684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5735,7 +5743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5789,7 +5797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5956,7 +5964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6052,7 +6060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6158,7 +6166,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6217,7 +6225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6271,7 +6279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6438,7 +6446,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6534,7 +6542,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6640,7 +6648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6699,7 +6707,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6753,7 +6761,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6920,7 +6928,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7015,7 +7023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7121,7 +7129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7180,7 +7188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7234,7 +7242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7401,7 +7409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7497,7 +7505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7603,7 +7611,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7662,7 +7670,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7716,7 +7724,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7883,7 +7891,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7979,7 +7987,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8085,7 +8093,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8144,7 +8152,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8198,7 +8206,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8365,7 +8373,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8461,7 +8469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8565,7 +8573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8624,7 +8632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8678,7 +8686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8845,7 +8853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8944,7 +8952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9048,7 +9056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9107,7 +9115,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9161,7 +9169,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9328,7 +9336,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9425,7 +9433,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9529,7 +9537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9588,7 +9596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9642,7 +9650,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9809,7 +9817,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10204,7 +10212,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10308,7 +10316,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10367,7 +10375,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10421,7 +10429,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10588,7 +10596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10858,7 +10866,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10962,7 +10970,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11021,7 +11029,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11075,7 +11083,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11242,7 +11250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12130,7 +12138,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12236,7 +12244,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12295,7 +12303,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12349,7 +12357,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12516,7 +12524,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12613,7 +12621,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12719,7 +12727,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12778,7 +12786,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12832,7 +12840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12999,7 +13007,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13301,7 +13309,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13346,7 +13354,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13405,7 +13413,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
index 05ca39b..82d5913 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -6506,7 +6514,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6612,7 +6620,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6671,7 +6679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6725,7 +6733,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6892,7 +6900,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -7038,7 +7046,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7144,7 +7152,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7203,7 +7211,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7257,7 +7265,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7424,7 +7432,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -7570,7 +7578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7676,7 +7684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7735,7 +7743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7789,7 +7797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7956,7 +7964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -8101,7 +8109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8207,7 +8215,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8266,7 +8274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8320,7 +8328,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8487,7 +8495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8633,7 +8641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8739,7 +8747,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8798,7 +8806,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8852,7 +8860,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9019,7 +9027,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9165,7 +9173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9271,7 +9279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9330,7 +9338,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9384,7 +9392,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9551,7 +9559,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9697,7 +9705,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9801,7 +9809,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9860,7 +9868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9914,7 +9922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10081,7 +10089,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -10180,7 +10188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10284,7 +10292,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10343,7 +10351,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10397,7 +10405,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10564,7 +10572,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -10661,7 +10669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10765,7 +10773,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10824,7 +10832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10878,7 +10886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11045,7 +11053,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -11540,7 +11548,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -11644,7 +11652,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11703,7 +11711,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11757,7 +11765,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11924,7 +11932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -12244,7 +12252,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12348,7 +12356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12407,7 +12415,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12461,7 +12469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12628,7 +12636,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -13616,7 +13624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -13722,7 +13730,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -13781,7 +13789,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -13835,7 +13843,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14002,7 +14010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -14099,7 +14107,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14205,7 +14213,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14264,7 +14272,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14318,7 +14326,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14485,7 +14493,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -14787,7 +14795,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14832,7 +14840,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -14891,7 +14899,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_main.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_main.json
index 2259458..a9ebe9a 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_prod_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -6506,7 +6514,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6612,7 +6620,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6671,7 +6679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6725,7 +6733,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6892,7 +6900,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -7038,7 +7046,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7144,7 +7152,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7203,7 +7211,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7257,7 +7265,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7424,7 +7432,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -7570,7 +7578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7676,7 +7684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7735,7 +7743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7789,7 +7797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7956,7 +7964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -8101,7 +8109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8207,7 +8215,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8266,7 +8274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8320,7 +8328,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8487,7 +8495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8633,7 +8641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8739,7 +8747,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8798,7 +8806,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8852,7 +8860,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9019,7 +9027,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9165,7 +9173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9271,7 +9279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9330,7 +9338,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9384,7 +9392,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9551,7 +9559,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9697,7 +9705,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9801,7 +9809,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9860,7 +9868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9914,7 +9922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10081,7 +10089,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -10180,7 +10188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10284,7 +10292,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10343,7 +10351,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10397,7 +10405,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10564,7 +10572,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -10661,7 +10669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10765,7 +10773,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10824,7 +10832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10878,7 +10886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11045,7 +11053,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -11540,7 +11548,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -11644,7 +11652,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11703,7 +11711,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11757,7 +11765,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11924,7 +11932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -12244,7 +12252,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12348,7 +12356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12407,7 +12415,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12461,7 +12469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12628,7 +12636,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -13616,7 +13624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -13722,7 +13730,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -13781,7 +13789,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -13835,7 +13843,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14002,7 +14010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -14099,7 +14107,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14205,7 +14213,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14264,7 +14272,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14318,7 +14326,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14485,7 +14493,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -14787,7 +14795,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14832,7 +14840,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -14891,7 +14899,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
index 4c89104..4a8fe7f 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5606,7 +5614,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5771,7 +5779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5825,7 +5833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5992,7 +6000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6088,7 +6096,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6194,7 +6202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6253,7 +6261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6307,7 +6315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6474,7 +6482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6570,7 +6578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6676,7 +6684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6735,7 +6743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6789,7 +6797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6956,7 +6964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7157,7 +7165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7216,7 +7224,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7270,7 +7278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7437,7 +7445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7533,7 +7541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7639,7 +7647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7698,7 +7706,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7752,7 +7760,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7919,7 +7927,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8015,7 +8023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8121,7 +8129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8180,7 +8188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8234,7 +8242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8401,7 +8409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8497,7 +8505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8601,7 +8609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8660,7 +8668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8714,7 +8722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8881,7 +8889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8980,7 +8988,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9084,7 +9092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9143,7 +9151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9364,7 +9372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9461,7 +9469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9565,7 +9573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9678,7 +9686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9845,7 +9853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10240,7 +10248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10344,7 +10352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10403,7 +10411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10457,7 +10465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10624,7 +10632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10894,7 +10902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10998,7 +11006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11057,7 +11065,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11111,7 +11119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11278,7 +11286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12166,7 +12174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12272,7 +12280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12331,7 +12339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12385,7 +12393,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12552,7 +12560,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12649,7 +12657,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12755,7 +12763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12814,7 +12822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12868,7 +12876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13035,7 +13043,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13337,7 +13345,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13382,7 +13390,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13441,7 +13449,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_main.json b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_main.json
index 97fd630..3a0a3ab 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_font_subset_staging_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5606,7 +5614,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5771,7 +5779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5825,7 +5833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5992,7 +6000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6088,7 +6096,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6194,7 +6202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6253,7 +6261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6307,7 +6315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6474,7 +6482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6570,7 +6578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6676,7 +6684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6735,7 +6743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6789,7 +6797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6956,7 +6964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7157,7 +7165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7216,7 +7224,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7270,7 +7278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7437,7 +7445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7533,7 +7541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7639,7 +7647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7698,7 +7706,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7752,7 +7760,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7919,7 +7927,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8015,7 +8023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8121,7 +8129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8180,7 +8188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8234,7 +8242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8401,7 +8409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8497,7 +8505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8601,7 +8609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8660,7 +8668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8714,7 +8722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8881,7 +8889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8980,7 +8988,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9084,7 +9092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9143,7 +9151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9364,7 +9372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9461,7 +9469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9565,7 +9573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9678,7 +9686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9845,7 +9853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10240,7 +10248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10344,7 +10352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10403,7 +10411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10457,7 +10465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10624,7 +10632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10894,7 +10902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10998,7 +11006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11057,7 +11065,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11111,7 +11119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11278,7 +11286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12166,7 +12174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12272,7 +12280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12331,7 +12339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12385,7 +12393,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12552,7 +12560,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12649,7 +12657,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12755,7 +12763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12814,7 +12822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12868,7 +12876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13035,7 +13043,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13337,7 +13345,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13382,7 +13390,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13441,7 +13449,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_no_lto_prod_flutter-3.8-candidate.10.json
index 05ca39b..82d5913 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_prod_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -6506,7 +6514,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6612,7 +6620,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6671,7 +6679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6725,7 +6733,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6892,7 +6900,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -7038,7 +7046,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7144,7 +7152,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7203,7 +7211,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7257,7 +7265,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7424,7 +7432,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -7570,7 +7578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7676,7 +7684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7735,7 +7743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7789,7 +7797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7956,7 +7964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -8101,7 +8109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8207,7 +8215,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8266,7 +8274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8320,7 +8328,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8487,7 +8495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8633,7 +8641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8739,7 +8747,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8798,7 +8806,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8852,7 +8860,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9019,7 +9027,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9165,7 +9173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9271,7 +9279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9330,7 +9338,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9384,7 +9392,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9551,7 +9559,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9697,7 +9705,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9801,7 +9809,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9860,7 +9868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9914,7 +9922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10081,7 +10089,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -10180,7 +10188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10284,7 +10292,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10343,7 +10351,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10397,7 +10405,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10564,7 +10572,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -10661,7 +10669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10765,7 +10773,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10824,7 +10832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10878,7 +10886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11045,7 +11053,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -11540,7 +11548,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -11644,7 +11652,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11703,7 +11711,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11757,7 +11765,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11924,7 +11932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -12244,7 +12252,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12348,7 +12356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12407,7 +12415,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12461,7 +12469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12628,7 +12636,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -13616,7 +13624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -13722,7 +13730,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -13781,7 +13789,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -13835,7 +13843,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14002,7 +14010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -14099,7 +14107,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14205,7 +14213,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14264,7 +14272,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14318,7 +14326,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14485,7 +14493,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -14787,7 +14795,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14832,7 +14840,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -14891,7 +14899,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_prod_main.json b/recipes/engine/engine.expected/mac_upload_no_lto_prod_main.json
index 2259458..a9ebe9a 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_prod_main.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_prod_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -6506,7 +6514,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6612,7 +6620,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6671,7 +6679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6725,7 +6733,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6892,7 +6900,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -7038,7 +7046,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7144,7 +7152,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7203,7 +7211,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7257,7 +7265,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7424,7 +7432,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -7570,7 +7578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7676,7 +7684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7735,7 +7743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7789,7 +7797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7956,7 +7964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -8101,7 +8109,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8207,7 +8215,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8266,7 +8274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8320,7 +8328,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8487,7 +8495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8633,7 +8641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8739,7 +8747,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8798,7 +8806,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8852,7 +8860,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9019,7 +9027,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9165,7 +9173,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9271,7 +9279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9330,7 +9338,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9384,7 +9392,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9551,7 +9559,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9697,7 +9705,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9801,7 +9809,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9860,7 +9868,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9914,7 +9922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10081,7 +10089,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -10180,7 +10188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10284,7 +10292,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10343,7 +10351,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10397,7 +10405,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10564,7 +10572,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -10661,7 +10669,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10765,7 +10773,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10824,7 +10832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10878,7 +10886,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11045,7 +11053,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -11540,7 +11548,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -11644,7 +11652,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11703,7 +11711,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11757,7 +11765,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11924,7 +11932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -12244,7 +12252,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12348,7 +12356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12407,7 +12415,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12461,7 +12469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12628,7 +12636,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -13616,7 +13624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -13722,7 +13730,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -13781,7 +13789,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -13835,7 +13843,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14002,7 +14010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -14099,7 +14107,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14205,7 +14213,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14264,7 +14272,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14318,7 +14326,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14485,7 +14493,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -14787,7 +14795,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14832,7 +14840,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -14891,7 +14899,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_no_lto_staging_flutter-3.8-candidate.10.json
index 4c89104..4a8fe7f 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_staging_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5606,7 +5614,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5771,7 +5779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5825,7 +5833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5992,7 +6000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6088,7 +6096,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6194,7 +6202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6253,7 +6261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6307,7 +6315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6474,7 +6482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6570,7 +6578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6676,7 +6684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6735,7 +6743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6789,7 +6797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6956,7 +6964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7157,7 +7165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7216,7 +7224,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7270,7 +7278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7437,7 +7445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7533,7 +7541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7639,7 +7647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7698,7 +7706,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7752,7 +7760,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7919,7 +7927,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8015,7 +8023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8121,7 +8129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8180,7 +8188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8234,7 +8242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8401,7 +8409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8497,7 +8505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8601,7 +8609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8660,7 +8668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8714,7 +8722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8881,7 +8889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8980,7 +8988,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9084,7 +9092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9143,7 +9151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9364,7 +9372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9461,7 +9469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9565,7 +9573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9678,7 +9686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9845,7 +9853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10240,7 +10248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10344,7 +10352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10403,7 +10411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10457,7 +10465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10624,7 +10632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10894,7 +10902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10998,7 +11006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11057,7 +11065,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11111,7 +11119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11278,7 +11286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12166,7 +12174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12272,7 +12280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12331,7 +12339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12385,7 +12393,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12552,7 +12560,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12649,7 +12657,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12755,7 +12763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12814,7 +12822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12868,7 +12876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13035,7 +13043,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13337,7 +13345,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13382,7 +13390,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13441,7 +13449,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_no_lto_staging_main.json b/recipes/engine/engine.expected/mac_upload_no_lto_staging_main.json
index 97fd630..3a0a3ab 100644
--- a/recipes/engine/engine.expected/mac_upload_no_lto_staging_main.json
+++ b/recipes/engine/engine.expected/mac_upload_no_lto_staging_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5606,7 +5614,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5712,7 +5720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5771,7 +5779,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5825,7 +5833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5992,7 +6000,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6088,7 +6096,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6194,7 +6202,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6253,7 +6261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6307,7 +6315,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6474,7 +6482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6570,7 +6578,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6676,7 +6684,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6735,7 +6743,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6789,7 +6797,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6956,7 +6964,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7051,7 +7059,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7157,7 +7165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7216,7 +7224,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7270,7 +7278,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7437,7 +7445,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7533,7 +7541,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7639,7 +7647,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7698,7 +7706,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7752,7 +7760,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7919,7 +7927,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8015,7 +8023,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8121,7 +8129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8180,7 +8188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8234,7 +8242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8401,7 +8409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8497,7 +8505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8601,7 +8609,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8660,7 +8668,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8714,7 +8722,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8881,7 +8889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8980,7 +8988,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9084,7 +9092,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9143,7 +9151,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9197,7 +9205,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9364,7 +9372,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9461,7 +9469,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9565,7 +9573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9624,7 +9632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9678,7 +9686,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9845,7 +9853,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10240,7 +10248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10344,7 +10352,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10403,7 +10411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10457,7 +10465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10624,7 +10632,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10894,7 +10902,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10998,7 +11006,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11057,7 +11065,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11111,7 +11119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11278,7 +11286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12166,7 +12174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12272,7 +12280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12331,7 +12339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12385,7 +12393,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12552,7 +12560,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12649,7 +12657,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12755,7 +12763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12814,7 +12822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12868,7 +12876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13035,7 +13043,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13337,7 +13345,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13382,7 +13390,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13441,7 +13449,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_prod_flutter-3.8-candidate.10.json
index 55925bd..c9f138f 100644
--- a/recipes/engine/engine.expected/mac_upload_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_prod_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -6505,7 +6513,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6611,7 +6619,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6670,7 +6678,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6724,7 +6732,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6891,7 +6899,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -7036,7 +7044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7142,7 +7150,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7201,7 +7209,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7255,7 +7263,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7422,7 +7430,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -7567,7 +7575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7673,7 +7681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7732,7 +7740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7786,7 +7794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7953,7 +7961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -8097,7 +8105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8203,7 +8211,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8262,7 +8270,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8316,7 +8324,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8483,7 +8491,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8628,7 +8636,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8734,7 +8742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8793,7 +8801,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8847,7 +8855,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9014,7 +9022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9159,7 +9167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9265,7 +9273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9324,7 +9332,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9378,7 +9386,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9545,7 +9553,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9691,7 +9699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9795,7 +9803,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9854,7 +9862,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9908,7 +9916,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10075,7 +10083,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -10174,7 +10182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10278,7 +10286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10337,7 +10345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10391,7 +10399,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10558,7 +10566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -10654,7 +10662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10758,7 +10766,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10817,7 +10825,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10871,7 +10879,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11038,7 +11046,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -11532,7 +11540,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -11636,7 +11644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11695,7 +11703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11749,7 +11757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11916,7 +11924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -12235,7 +12243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12339,7 +12347,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12398,7 +12406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12452,7 +12460,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12619,7 +12627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -13607,7 +13615,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -13713,7 +13721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -13772,7 +13780,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -13826,7 +13834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13993,7 +14001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -14090,7 +14098,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14196,7 +14204,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14255,7 +14263,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14309,7 +14317,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14476,7 +14484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -14778,7 +14786,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14823,7 +14831,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -14882,7 +14890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_prod_main.json b/recipes/engine/engine.expected/mac_upload_prod_main.json
index ca972c4..9a03cda 100644
--- a/recipes/engine/engine.expected/mac_upload_prod_main.json
+++ b/recipes/engine/engine.expected/mac_upload_prod_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -6505,7 +6513,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6611,7 +6619,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6670,7 +6678,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6724,7 +6732,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6891,7 +6899,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -7036,7 +7044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7142,7 +7150,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7201,7 +7209,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7255,7 +7263,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7422,7 +7430,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -7567,7 +7575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7673,7 +7681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7732,7 +7740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7786,7 +7794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7953,7 +7961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -8097,7 +8105,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8203,7 +8211,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8262,7 +8270,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8316,7 +8324,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8483,7 +8491,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -8628,7 +8636,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8734,7 +8742,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8793,7 +8801,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8847,7 +8855,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9014,7 +9022,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -9159,7 +9167,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9265,7 +9273,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9324,7 +9332,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9378,7 +9386,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9545,7 +9553,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9691,7 +9699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9795,7 +9803,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9854,7 +9862,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9908,7 +9916,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10075,7 +10083,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -10174,7 +10182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10278,7 +10286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10337,7 +10345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10391,7 +10399,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10558,7 +10566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -10654,7 +10662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10758,7 +10766,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10817,7 +10825,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10871,7 +10879,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11038,7 +11046,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -11532,7 +11540,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -11636,7 +11644,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11695,7 +11703,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11749,7 +11757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11916,7 +11924,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -12235,7 +12243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12339,7 +12347,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12398,7 +12406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12452,7 +12460,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12619,7 +12627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -13607,7 +13615,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -13713,7 +13721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -13772,7 +13780,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -13826,7 +13834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13993,7 +14001,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -14090,7 +14098,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -14196,7 +14204,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -14255,7 +14263,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -14309,7 +14317,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -14476,7 +14484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -14778,7 +14786,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -14823,7 +14831,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -14882,7 +14890,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/mac_upload_staging_flutter-3.8-candidate.10.json
index 7d8ba03..38e3d31 100644
--- a/recipes/engine/engine.expected/mac_upload_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/mac_upload_staging_flutter-3.8-candidate.10.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5605,7 +5613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5711,7 +5719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5770,7 +5778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5824,7 +5832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5991,7 +5999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6086,7 +6094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6251,7 +6259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6305,7 +6313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6472,7 +6480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6567,7 +6575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6673,7 +6681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6732,7 +6740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6786,7 +6794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6953,7 +6961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7047,7 +7055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7153,7 +7161,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7212,7 +7220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7266,7 +7274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7433,7 +7441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7528,7 +7536,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7634,7 +7642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7693,7 +7701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7747,7 +7755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7914,7 +7922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8009,7 +8017,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8115,7 +8123,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8174,7 +8182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8228,7 +8236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8395,7 +8403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8491,7 +8499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8595,7 +8603,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8708,7 +8716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8875,7 +8883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8974,7 +8982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9078,7 +9086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9137,7 +9145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9191,7 +9199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9358,7 +9366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9454,7 +9462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9558,7 +9566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9617,7 +9625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9671,7 +9679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9838,7 +9846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10232,7 +10240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10336,7 +10344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10395,7 +10403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10449,7 +10457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10616,7 +10624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10885,7 +10893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10989,7 +10997,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11048,7 +11056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11102,7 +11110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11269,7 +11277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12157,7 +12165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12263,7 +12271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12322,7 +12330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12543,7 +12551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12640,7 +12648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12746,7 +12754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12805,7 +12813,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12859,7 +12867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13026,7 +13034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13328,7 +13336,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13373,7 +13381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13432,7 +13440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/mac_upload_staging_main.json b/recipes/engine/engine.expected/mac_upload_staging_main.json
index b2bd33c..3c98bbb 100644
--- a/recipes/engine/engine.expected/mac_upload_staging_main.json
+++ b/recipes/engine/engine.expected/mac_upload_staging_main.json
@@ -1136,12 +1136,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1149,8 +1156,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1195,19 +1202,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1222,7 +1226,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1267,7 +1271,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1277,9 +1281,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1328,7 +1332,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1336,7 +1340,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1346,7 +1350,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1458,7 +1462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1517,7 +1521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1571,7 +1575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1738,12 +1742,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1751,8 +1762,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1789,19 +1800,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1816,7 +1824,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1853,7 +1861,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1863,9 +1871,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1906,7 +1914,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1914,7 +1922,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1924,7 +1932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -2067,7 +2075,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2176,7 +2184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2235,7 +2243,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2289,7 +2297,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2456,7 +2464,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2599,7 +2607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2708,7 +2716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2767,7 +2775,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2821,7 +2829,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2988,7 +2996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3133,7 +3141,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3242,7 +3250,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3301,7 +3309,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3355,7 +3363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3522,7 +3530,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3620,7 +3628,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3726,7 +3734,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3785,7 +3793,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3839,7 +3847,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4006,7 +4014,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4104,7 +4112,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4210,7 +4218,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4269,7 +4277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4323,7 +4331,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4490,7 +4498,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -5605,7 +5613,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5711,7 +5719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5770,7 +5778,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5824,7 +5832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5991,7 +5999,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -6086,7 +6094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6192,7 +6200,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6251,7 +6259,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6305,7 +6313,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6472,7 +6480,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -6567,7 +6575,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6673,7 +6681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6732,7 +6740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6786,7 +6794,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -6953,7 +6961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -7047,7 +7055,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7153,7 +7161,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7212,7 +7220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7266,7 +7274,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7433,7 +7441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -7528,7 +7536,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -7634,7 +7642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -7693,7 +7701,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -7747,7 +7755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7914,7 +7922,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -8009,7 +8017,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8115,7 +8123,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8174,7 +8182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8228,7 +8236,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8395,7 +8403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -8491,7 +8499,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8595,7 +8603,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8654,7 +8662,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8708,7 +8716,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8875,7 +8883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
@@ -8974,7 +8982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9078,7 +9086,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9137,7 +9145,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9191,7 +9199,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9358,7 +9366,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:00.500000\", \"time_stamp_int\": 1337000042000}}"
     ],
@@ -9454,7 +9462,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9558,7 +9566,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9617,7 +9625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9671,7 +9679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9838,7 +9846,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:03.500000\", \"time_stamp_int\": 1337000045000}}"
     ],
@@ -10232,7 +10240,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10336,7 +10344,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -10395,7 +10403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -10449,7 +10457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -10616,7 +10624,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:06.500000\", \"time_stamp_int\": 1337000048000}}"
     ],
@@ -10885,7 +10893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -10989,7 +10997,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -11048,7 +11056,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -11102,7 +11110,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -11269,7 +11277,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:09.500000\", \"time_stamp_int\": 1337000051000}}"
     ],
@@ -12157,7 +12165,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12263,7 +12271,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12322,7 +12330,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12376,7 +12384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -12543,7 +12551,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:12.500000\", \"time_stamp_int\": 1337000054000}}"
     ],
@@ -12640,7 +12648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -12746,7 +12754,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -12805,7 +12813,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -12859,7 +12867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -13026,7 +13034,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Mac Engine\", \"time_stamp\": \"2012-05-14 12:54:15.500000\", \"time_stamp_int\": 1337000057000}}"
     ],
@@ -13328,7 +13336,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -13373,7 +13381,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -13432,7 +13440,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/engine.expected/pull_request.json b/recipes/engine/engine.expected/pull_request.json
index dfb02a2..5bb1f8b 100644
--- a/recipes/engine/engine.expected/pull_request.json
+++ b/recipes/engine/engine.expected/pull_request.json
@@ -658,12 +658,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -671,8 +678,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -717,19 +724,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -744,7 +748,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -789,7 +793,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -799,9 +803,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -858,7 +862,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -868,7 +872,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -973,7 +977,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1086,7 +1090,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1253,12 +1257,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1266,8 +1277,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1304,19 +1315,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1331,7 +1339,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1368,7 +1376,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1378,9 +1386,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1421,7 +1429,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1429,7 +1437,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1439,7 +1447,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1489,7 +1497,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1600,7 +1608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1659,7 +1667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1713,7 +1721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1880,7 +1888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -1977,7 +1985,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2086,7 +2094,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2145,7 +2153,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2199,7 +2207,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2366,7 +2374,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2463,7 +2471,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -2579,7 +2587,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2638,7 +2646,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -2692,7 +2700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2859,7 +2867,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3000,7 +3008,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3108,7 +3116,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3167,7 +3175,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3221,7 +3229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3388,7 +3396,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3531,7 +3539,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -3638,7 +3646,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3697,7 +3705,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -3751,7 +3759,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -3918,7 +3926,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4012,7 +4020,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4118,7 +4126,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4177,7 +4185,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4231,7 +4239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4398,7 +4406,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4492,7 +4500,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -4600,7 +4608,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4659,7 +4667,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -4713,7 +4721,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -4880,7 +4888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -4974,7 +4982,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5080,7 +5088,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5139,7 +5147,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5193,7 +5201,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5360,7 +5368,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -5560,7 +5568,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5619,7 +5627,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -5673,7 +5681,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -5840,7 +5848,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:48.500000\", \"time_stamp_int\": 1337000030000}}"
     ],
@@ -6700,7 +6708,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -6814,7 +6822,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6873,7 +6881,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -6927,7 +6935,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -7094,7 +7102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:51.500000\", \"time_stamp_int\": 1337000033000}}"
     ],
@@ -7401,7 +7409,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/latest"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/5e1e2bcac305958b27077ca136f35f0abae7cf38c9af678f7d220ed0cb51d4f8"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -7446,7 +7454,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/latest",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/5e1e2bcac305958b27077ca136f35f0abae7cf38c9af678f7d220ed0cb51d4f8",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} latest",
       "-max-threads",
@@ -7505,7 +7513,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/latest/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/5e1e2bcac305958b27077ca136f35f0abae7cf38c9af678f7d220ed0cb51d4f8/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -8582,7 +8590,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -8688,7 +8696,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -8747,7 +8755,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -8801,7 +8809,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -8968,7 +8976,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:54.500000\", \"time_stamp_int\": 1337000036000}}"
     ],
@@ -9111,7 +9119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -9217,7 +9225,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -9276,7 +9284,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -9330,7 +9338,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -9497,7 +9505,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Host Engine\", \"time_stamp\": \"2012-05-14 12:53:57.500000\", \"time_stamp_int\": 1337000039000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_flutter_flutter-3.8-candidate.10.json
index 3f2f541..a1a7f84 100644
--- a/recipes/engine/engine.expected/win_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_flutter_flutter-3.8-candidate.10.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2996,7 +3004,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3174,7 +3182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3233,7 +3241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3413,7 +3421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3467,7 +3475,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3581,7 +3589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3645,7 +3653,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3704,7 +3712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3938,7 +3946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4052,7 +4060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4355,7 +4363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4409,7 +4417,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4523,7 +4531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4587,7 +4595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4646,7 +4654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4826,7 +4834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4880,7 +4888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4994,7 +5002,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5058,7 +5066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5117,7 +5125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5297,7 +5305,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5351,7 +5359,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5465,7 +5473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5529,7 +5537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5588,7 +5596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5768,7 +5776,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_flutter_main.json b/recipes/engine/engine.expected/win_flutter_main.json
index 3f2f541..a1a7f84 100644
--- a/recipes/engine/engine.expected/win_flutter_main.json
+++ b/recipes/engine/engine.expected/win_flutter_main.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2996,7 +3004,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3174,7 +3182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3233,7 +3241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3413,7 +3421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3467,7 +3475,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3581,7 +3589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3645,7 +3653,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3704,7 +3712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3938,7 +3946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4052,7 +4060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4355,7 +4363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4409,7 +4417,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4523,7 +4531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4587,7 +4595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4646,7 +4654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4826,7 +4834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4880,7 +4888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4994,7 +5002,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5058,7 +5066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5117,7 +5125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5297,7 +5305,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5351,7 +5359,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5465,7 +5473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5529,7 +5537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5588,7 +5596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5768,7 +5776,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_font_subset_flutter_flutter-3.8-candidate.10.json
index 3f2f541..a1a7f84 100644
--- a/recipes/engine/engine.expected/win_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2996,7 +3004,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3174,7 +3182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3233,7 +3241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3413,7 +3421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3467,7 +3475,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3581,7 +3589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3645,7 +3653,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3704,7 +3712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3938,7 +3946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4052,7 +4060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4355,7 +4363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4409,7 +4417,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4523,7 +4531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4587,7 +4595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4646,7 +4654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4826,7 +4834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4880,7 +4888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4994,7 +5002,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5058,7 +5066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5117,7 +5125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5297,7 +5305,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5351,7 +5359,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5465,7 +5473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5529,7 +5537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5588,7 +5596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5768,7 +5776,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_font_subset_flutter_main.json b/recipes/engine/engine.expected/win_font_subset_flutter_main.json
index 3f2f541..a1a7f84 100644
--- a/recipes/engine/engine.expected/win_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/win_font_subset_flutter_main.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2996,7 +3004,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3174,7 +3182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3233,7 +3241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3413,7 +3421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3467,7 +3475,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3581,7 +3589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3645,7 +3653,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3704,7 +3712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3938,7 +3946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4052,7 +4060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4355,7 +4363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4409,7 +4417,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4523,7 +4531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4587,7 +4595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4646,7 +4654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4826,7 +4834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4880,7 +4888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4994,7 +5002,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5058,7 +5066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5117,7 +5125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5297,7 +5305,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5351,7 +5359,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5465,7 +5473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5529,7 +5537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5588,7 +5596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5768,7 +5776,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_font_subset_prod_flutter-3.8-candidate.10.json
index 7f78ed5..f55e774 100644
--- a/recipes/engine/engine.expected/win_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_font_subset_prod_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3094,7 +3102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3208,7 +3216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3272,7 +3280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3331,7 +3339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3511,7 +3519,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3565,7 +3573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3679,7 +3687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3743,7 +3751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3802,7 +3810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3982,7 +3990,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4036,7 +4044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4150,7 +4158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4214,7 +4222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4273,7 +4281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4453,7 +4461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4507,7 +4515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4685,7 +4693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4744,7 +4752,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4924,7 +4932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4978,7 +4986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5092,7 +5100,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5156,7 +5164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5215,7 +5223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5395,7 +5403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5449,7 +5457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5563,7 +5571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5627,7 +5635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5686,7 +5694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5866,7 +5874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_font_subset_prod_main.json b/recipes/engine/engine.expected/win_font_subset_prod_main.json
index 0bfc4d3..045c0ac 100644
--- a/recipes/engine/engine.expected/win_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/win_font_subset_prod_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3094,7 +3102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3208,7 +3216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3272,7 +3280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3331,7 +3339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3511,7 +3519,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3565,7 +3573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3679,7 +3687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3743,7 +3751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3802,7 +3810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3982,7 +3990,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4036,7 +4044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4150,7 +4158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4214,7 +4222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4273,7 +4281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4453,7 +4461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4507,7 +4515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4685,7 +4693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4744,7 +4752,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4924,7 +4932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4978,7 +4986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5092,7 +5100,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5156,7 +5164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5215,7 +5223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5395,7 +5403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5449,7 +5457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5563,7 +5571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5627,7 +5635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5686,7 +5694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5866,7 +5874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_font_subset_staging_flutter-3.8-candidate.10.json
index 698afdb..7127d5d 100644
--- a/recipes/engine/engine.expected/win_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_font_subset_staging_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3094,7 +3102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3208,7 +3216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3272,7 +3280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3331,7 +3339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3511,7 +3519,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3565,7 +3573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3679,7 +3687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3743,7 +3751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3802,7 +3810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3982,7 +3990,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4036,7 +4044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4150,7 +4158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4214,7 +4222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4273,7 +4281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4453,7 +4461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4507,7 +4515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4685,7 +4693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4744,7 +4752,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4924,7 +4932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4978,7 +4986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5092,7 +5100,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5156,7 +5164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5215,7 +5223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5395,7 +5403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5449,7 +5457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5563,7 +5571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5627,7 +5635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5686,7 +5694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5866,7 +5874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_font_subset_staging_main.json b/recipes/engine/engine.expected/win_font_subset_staging_main.json
index dab3f41..e13e910 100644
--- a/recipes/engine/engine.expected/win_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/win_font_subset_staging_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3094,7 +3102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3208,7 +3216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3272,7 +3280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3331,7 +3339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3511,7 +3519,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3565,7 +3573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3679,7 +3687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3743,7 +3751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3802,7 +3810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3982,7 +3990,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4036,7 +4044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4150,7 +4158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4214,7 +4222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4273,7 +4281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4453,7 +4461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4507,7 +4515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4685,7 +4693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4744,7 +4752,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4924,7 +4932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4978,7 +4986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5092,7 +5100,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5156,7 +5164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5215,7 +5223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5395,7 +5403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5449,7 +5457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5563,7 +5571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5627,7 +5635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5686,7 +5694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5866,7 +5874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_no_lto_flutter_flutter-3.8-candidate.10.json
index 04d6e7a..3eb2515 100644
--- a/recipes/engine/engine.expected/win_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3116,7 +3124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3180,7 +3188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3239,7 +3247,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3419,7 +3427,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3473,7 +3481,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3587,7 +3595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3651,7 +3659,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3710,7 +3718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3890,7 +3898,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3944,7 +3952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4058,7 +4066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4122,7 +4130,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4181,7 +4189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4361,7 +4369,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4415,7 +4423,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4593,7 +4601,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4652,7 +4660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4832,7 +4840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4886,7 +4894,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5000,7 +5008,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5064,7 +5072,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5123,7 +5131,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5303,7 +5311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5357,7 +5365,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5471,7 +5479,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5535,7 +5543,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5594,7 +5602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5774,7 +5782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_no_lto_flutter_main.json b/recipes/engine/engine.expected/win_no_lto_flutter_main.json
index 04d6e7a..3eb2515 100644
--- a/recipes/engine/engine.expected/win_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/win_no_lto_flutter_main.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3116,7 +3124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3180,7 +3188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3239,7 +3247,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3419,7 +3427,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3473,7 +3481,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3587,7 +3595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3651,7 +3659,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3710,7 +3718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3890,7 +3898,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3944,7 +3952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4058,7 +4066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4122,7 +4130,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4181,7 +4189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4361,7 +4369,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4415,7 +4423,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4593,7 +4601,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4652,7 +4660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4832,7 +4840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4886,7 +4894,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5000,7 +5008,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5064,7 +5072,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5123,7 +5131,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5303,7 +5311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5357,7 +5365,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5471,7 +5479,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5535,7 +5543,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5594,7 +5602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5774,7 +5782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index 04d6e7a..3eb2515 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3116,7 +3124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3180,7 +3188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3239,7 +3247,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3419,7 +3427,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3473,7 +3481,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3587,7 +3595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3651,7 +3659,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3710,7 +3718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3890,7 +3898,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3944,7 +3952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4058,7 +4066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4122,7 +4130,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4181,7 +4189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4361,7 +4369,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4415,7 +4423,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4593,7 +4601,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4652,7 +4660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4832,7 +4840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4886,7 +4894,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5000,7 +5008,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5064,7 +5072,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5123,7 +5131,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5303,7 +5311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5357,7 +5365,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5471,7 +5479,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5535,7 +5543,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5594,7 +5602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5774,7 +5782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_main.json
index 04d6e7a..3eb2515 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_flutter_main.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3116,7 +3124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3180,7 +3188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3239,7 +3247,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3419,7 +3427,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3473,7 +3481,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3587,7 +3595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3651,7 +3659,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3710,7 +3718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3890,7 +3898,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3944,7 +3952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4058,7 +4066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4122,7 +4130,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4181,7 +4189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4361,7 +4369,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4415,7 +4423,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4593,7 +4601,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4652,7 +4660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4832,7 +4840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4886,7 +4894,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5000,7 +5008,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5064,7 +5072,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5123,7 +5131,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5303,7 +5311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5357,7 +5365,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5471,7 +5479,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5535,7 +5543,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5594,7 +5602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5774,7 +5782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
index 0d91ead..2390beb 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3100,7 +3108,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3214,7 +3222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3278,7 +3286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3337,7 +3345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3517,7 +3525,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3571,7 +3579,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3685,7 +3693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3808,7 +3816,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3988,7 +3996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4042,7 +4050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4156,7 +4164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4220,7 +4228,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4279,7 +4287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4459,7 +4467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4513,7 +4521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4627,7 +4635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4691,7 +4699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4930,7 +4938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4984,7 +4992,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5098,7 +5106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5162,7 +5170,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5221,7 +5229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5401,7 +5409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5633,7 +5641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5692,7 +5700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5872,7 +5880,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_prod_main.json b/recipes/engine/engine.expected/win_no_lto_font_subset_prod_main.json
index be2b72c..0943805 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_prod_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3100,7 +3108,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3214,7 +3222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3278,7 +3286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3337,7 +3345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3517,7 +3525,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3571,7 +3579,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3685,7 +3693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3808,7 +3816,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3988,7 +3996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4042,7 +4050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4156,7 +4164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4220,7 +4228,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4279,7 +4287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4459,7 +4467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4513,7 +4521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4627,7 +4635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4691,7 +4699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4930,7 +4938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4984,7 +4992,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5098,7 +5106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5162,7 +5170,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5221,7 +5229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5401,7 +5409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5633,7 +5641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5692,7 +5700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5872,7 +5880,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
index 8c54713..31a703b 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3100,7 +3108,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3214,7 +3222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3278,7 +3286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3337,7 +3345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3517,7 +3525,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3571,7 +3579,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3685,7 +3693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3808,7 +3816,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3988,7 +3996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4042,7 +4050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4156,7 +4164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4220,7 +4228,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4279,7 +4287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4459,7 +4467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4513,7 +4521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4627,7 +4635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4691,7 +4699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4930,7 +4938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4984,7 +4992,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5098,7 +5106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5162,7 +5170,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5221,7 +5229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5401,7 +5409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5633,7 +5641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5692,7 +5700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5872,7 +5880,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_no_lto_font_subset_staging_main.json b/recipes/engine/engine.expected/win_no_lto_font_subset_staging_main.json
index a1a1448..f2e9120 100644
--- a/recipes/engine/engine.expected/win_no_lto_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/win_no_lto_font_subset_staging_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3100,7 +3108,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3214,7 +3222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3278,7 +3286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3337,7 +3345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3517,7 +3525,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3571,7 +3579,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3685,7 +3693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3808,7 +3816,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3988,7 +3996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4042,7 +4050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4156,7 +4164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4220,7 +4228,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4279,7 +4287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4459,7 +4467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4513,7 +4521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4627,7 +4635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4691,7 +4699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4930,7 +4938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4984,7 +4992,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5098,7 +5106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5162,7 +5170,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5221,7 +5229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5401,7 +5409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5633,7 +5641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5692,7 +5700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5872,7 +5880,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_no_lto_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_no_lto_prod_flutter-3.8-candidate.10.json
index 0d91ead..2390beb 100644
--- a/recipes/engine/engine.expected/win_no_lto_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_no_lto_prod_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3100,7 +3108,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3214,7 +3222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3278,7 +3286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3337,7 +3345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3517,7 +3525,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3571,7 +3579,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3685,7 +3693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3808,7 +3816,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3988,7 +3996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4042,7 +4050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4156,7 +4164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4220,7 +4228,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4279,7 +4287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4459,7 +4467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4513,7 +4521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4627,7 +4635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4691,7 +4699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4930,7 +4938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4984,7 +4992,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5098,7 +5106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5162,7 +5170,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5221,7 +5229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5401,7 +5409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5633,7 +5641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5692,7 +5700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5872,7 +5880,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_no_lto_prod_main.json b/recipes/engine/engine.expected/win_no_lto_prod_main.json
index be2b72c..0943805 100644
--- a/recipes/engine/engine.expected/win_no_lto_prod_main.json
+++ b/recipes/engine/engine.expected/win_no_lto_prod_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3100,7 +3108,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3214,7 +3222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3278,7 +3286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3337,7 +3345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3517,7 +3525,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3571,7 +3579,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3685,7 +3693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3808,7 +3816,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3988,7 +3996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4042,7 +4050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4156,7 +4164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4220,7 +4228,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4279,7 +4287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4459,7 +4467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4513,7 +4521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4627,7 +4635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4691,7 +4699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4930,7 +4938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4984,7 +4992,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5098,7 +5106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5162,7 +5170,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5221,7 +5229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5401,7 +5409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5633,7 +5641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5692,7 +5700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5872,7 +5880,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_no_lto_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_no_lto_staging_flutter-3.8-candidate.10.json
index 8c54713..31a703b 100644
--- a/recipes/engine/engine.expected/win_no_lto_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_no_lto_staging_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3100,7 +3108,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3214,7 +3222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3278,7 +3286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3337,7 +3345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3517,7 +3525,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3571,7 +3579,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3685,7 +3693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3808,7 +3816,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3988,7 +3996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4042,7 +4050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4156,7 +4164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4220,7 +4228,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4279,7 +4287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4459,7 +4467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4513,7 +4521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4627,7 +4635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4691,7 +4699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4930,7 +4938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4984,7 +4992,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5098,7 +5106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5162,7 +5170,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5221,7 +5229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5401,7 +5409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5633,7 +5641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5692,7 +5700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5872,7 +5880,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_no_lto_staging_main.json b/recipes/engine/engine.expected/win_no_lto_staging_main.json
index a1a1448..f2e9120 100644
--- a/recipes/engine/engine.expected/win_no_lto_staging_main.json
+++ b/recipes/engine/engine.expected/win_no_lto_staging_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3100,7 +3108,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3214,7 +3222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3278,7 +3286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3337,7 +3345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3517,7 +3525,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3571,7 +3579,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3685,7 +3693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3808,7 +3816,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3988,7 +3996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4042,7 +4050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4156,7 +4164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4220,7 +4228,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4279,7 +4287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4459,7 +4467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4513,7 +4521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4627,7 +4635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4691,7 +4699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4930,7 +4938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4984,7 +4992,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5098,7 +5106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5162,7 +5170,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5221,7 +5229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5401,7 +5409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5633,7 +5641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5692,7 +5700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5872,7 +5880,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_prod_flutter-3.8-candidate.10.json
index 7f78ed5..f55e774 100644
--- a/recipes/engine/engine.expected/win_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_prod_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3094,7 +3102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3208,7 +3216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3272,7 +3280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3331,7 +3339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3511,7 +3519,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3565,7 +3573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3679,7 +3687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3743,7 +3751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3802,7 +3810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3982,7 +3990,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4036,7 +4044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4150,7 +4158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4214,7 +4222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4273,7 +4281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4453,7 +4461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4507,7 +4515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4685,7 +4693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4744,7 +4752,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4924,7 +4932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4978,7 +4986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5092,7 +5100,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5156,7 +5164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5215,7 +5223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5395,7 +5403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5449,7 +5457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5563,7 +5571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5627,7 +5635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5686,7 +5694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5866,7 +5874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_prod_main.json b/recipes/engine/engine.expected/win_prod_main.json
index 0bfc4d3..045c0ac 100644
--- a/recipes/engine/engine.expected/win_prod_main.json
+++ b/recipes/engine/engine.expected/win_prod_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3094,7 +3102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3208,7 +3216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3272,7 +3280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3331,7 +3339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3511,7 +3519,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3565,7 +3573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3679,7 +3687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3743,7 +3751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3802,7 +3810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3982,7 +3990,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4036,7 +4044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4150,7 +4158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4214,7 +4222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4273,7 +4281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4453,7 +4461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4507,7 +4515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4685,7 +4693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4744,7 +4752,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4924,7 +4932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4978,7 +4986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5092,7 +5100,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5156,7 +5164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5215,7 +5223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5395,7 +5403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5449,7 +5457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5563,7 +5571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5627,7 +5635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5686,7 +5694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5866,7 +5874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_staging_flutter-3.8-candidate.10.json
index 698afdb..7127d5d 100644
--- a/recipes/engine/engine.expected/win_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_staging_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3094,7 +3102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3208,7 +3216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3272,7 +3280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3331,7 +3339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3511,7 +3519,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3565,7 +3573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3679,7 +3687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3743,7 +3751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3802,7 +3810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3982,7 +3990,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4036,7 +4044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4150,7 +4158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4214,7 +4222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4273,7 +4281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4453,7 +4461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4507,7 +4515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4685,7 +4693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4744,7 +4752,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4924,7 +4932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4978,7 +4986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5092,7 +5100,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5156,7 +5164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5215,7 +5223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5395,7 +5403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5449,7 +5457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5563,7 +5571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5627,7 +5635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5686,7 +5694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5866,7 +5874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_staging_main.json b/recipes/engine/engine.expected/win_staging_main.json
index dab3f41..e13e910 100644
--- a/recipes/engine/engine.expected/win_staging_main.json
+++ b/recipes/engine/engine.expected/win_staging_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3094,7 +3102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3208,7 +3216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3272,7 +3280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3331,7 +3339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3511,7 +3519,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3565,7 +3573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3679,7 +3687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3743,7 +3751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3802,7 +3810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3982,7 +3990,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4036,7 +4044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4150,7 +4158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4214,7 +4222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4273,7 +4281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4453,7 +4461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4507,7 +4515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4685,7 +4693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4744,7 +4752,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4924,7 +4932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4978,7 +4986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5092,7 +5100,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5156,7 +5164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5215,7 +5223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5395,7 +5403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5449,7 +5457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5563,7 +5571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5627,7 +5635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5686,7 +5694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5866,7 +5874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_flutter_flutter-3.8-candidate.10.json
index 3f2f541..a1a7f84 100644
--- a/recipes/engine/engine.expected/win_upload_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_flutter_flutter-3.8-candidate.10.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2996,7 +3004,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3174,7 +3182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3233,7 +3241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3413,7 +3421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3467,7 +3475,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3581,7 +3589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3645,7 +3653,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3704,7 +3712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3938,7 +3946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4052,7 +4060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4355,7 +4363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4409,7 +4417,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4523,7 +4531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4587,7 +4595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4646,7 +4654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4826,7 +4834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4880,7 +4888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4994,7 +5002,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5058,7 +5066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5117,7 +5125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5297,7 +5305,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5351,7 +5359,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5465,7 +5473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5529,7 +5537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5588,7 +5596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5768,7 +5776,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_flutter_main.json b/recipes/engine/engine.expected/win_upload_flutter_main.json
index 3f2f541..a1a7f84 100644
--- a/recipes/engine/engine.expected/win_upload_flutter_main.json
+++ b/recipes/engine/engine.expected/win_upload_flutter_main.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2996,7 +3004,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3174,7 +3182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3233,7 +3241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3413,7 +3421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3467,7 +3475,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3581,7 +3589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3645,7 +3653,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3704,7 +3712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3938,7 +3946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4052,7 +4060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4355,7 +4363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4409,7 +4417,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4523,7 +4531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4587,7 +4595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4646,7 +4654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4826,7 +4834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4880,7 +4888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4994,7 +5002,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5058,7 +5066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5117,7 +5125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5297,7 +5305,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5351,7 +5359,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5465,7 +5473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5529,7 +5537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5588,7 +5596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5768,7 +5776,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_font_subset_flutter_flutter-3.8-candidate.10.json
index 3f2f541..a1a7f84 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2996,7 +3004,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3174,7 +3182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3233,7 +3241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3413,7 +3421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3467,7 +3475,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3581,7 +3589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3645,7 +3653,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3704,7 +3712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3938,7 +3946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4052,7 +4060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4355,7 +4363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4409,7 +4417,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4523,7 +4531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4587,7 +4595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4646,7 +4654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4826,7 +4834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4880,7 +4888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4994,7 +5002,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5058,7 +5066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5117,7 +5125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5297,7 +5305,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5351,7 +5359,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5465,7 +5473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5529,7 +5537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5588,7 +5596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5768,7 +5776,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_flutter_main.json b/recipes/engine/engine.expected/win_upload_font_subset_flutter_main.json
index 3f2f541..a1a7f84 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_flutter_main.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -2996,7 +3004,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3110,7 +3118,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3174,7 +3182,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3233,7 +3241,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3413,7 +3421,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3467,7 +3475,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3581,7 +3589,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3645,7 +3653,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3704,7 +3712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3884,7 +3892,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3938,7 +3946,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4052,7 +4060,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4116,7 +4124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4355,7 +4363,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4409,7 +4417,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4523,7 +4531,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4587,7 +4595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4646,7 +4654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4826,7 +4834,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4880,7 +4888,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4994,7 +5002,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5058,7 +5066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5117,7 +5125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5297,7 +5305,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5351,7 +5359,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5465,7 +5473,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5529,7 +5537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5588,7 +5596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5768,7 +5776,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_font_subset_prod_flutter-3.8-candidate.10.json
index 17c5896..99e5571 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_prod_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3526,7 +3534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3704,7 +3712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3763,7 +3771,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3943,7 +3951,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3997,7 +4005,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4111,7 +4119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4234,7 +4242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4414,7 +4422,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4468,7 +4476,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4582,7 +4590,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4646,7 +4654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4705,7 +4713,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4885,7 +4893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4939,7 +4947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5053,7 +5061,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5117,7 +5125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5176,7 +5184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5356,7 +5364,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -5410,7 +5418,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5524,7 +5532,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5588,7 +5596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5647,7 +5655,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5827,7 +5835,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5881,7 +5889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5995,7 +6003,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6059,7 +6067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -6118,7 +6126,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -6298,7 +6306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_prod_main.json b/recipes/engine/engine.expected/win_upload_font_subset_prod_main.json
index 0c1c517..46d2cb1 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_prod_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3526,7 +3534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3704,7 +3712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3763,7 +3771,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3943,7 +3951,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3997,7 +4005,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4111,7 +4119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4234,7 +4242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4414,7 +4422,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4468,7 +4476,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4582,7 +4590,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4646,7 +4654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4705,7 +4713,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4885,7 +4893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4939,7 +4947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5053,7 +5061,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5117,7 +5125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5176,7 +5184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5356,7 +5364,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -5410,7 +5418,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5524,7 +5532,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5588,7 +5596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5647,7 +5655,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5827,7 +5835,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5881,7 +5889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5995,7 +6003,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6059,7 +6067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -6118,7 +6126,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -6298,7 +6306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_font_subset_staging_flutter-3.8-candidate.10.json
index 698afdb..7127d5d 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_staging_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3094,7 +3102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3208,7 +3216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3272,7 +3280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3331,7 +3339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3511,7 +3519,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3565,7 +3573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3679,7 +3687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3743,7 +3751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3802,7 +3810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3982,7 +3990,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4036,7 +4044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4150,7 +4158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4214,7 +4222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4273,7 +4281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4453,7 +4461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4507,7 +4515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4685,7 +4693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4744,7 +4752,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4924,7 +4932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4978,7 +4986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5092,7 +5100,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5156,7 +5164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5215,7 +5223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5395,7 +5403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5449,7 +5457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5563,7 +5571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5627,7 +5635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5686,7 +5694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5866,7 +5874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_font_subset_staging_main.json b/recipes/engine/engine.expected/win_upload_font_subset_staging_main.json
index dab3f41..e13e910 100644
--- a/recipes/engine/engine.expected/win_upload_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/win_upload_font_subset_staging_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3094,7 +3102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3208,7 +3216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3272,7 +3280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3331,7 +3339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3511,7 +3519,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3565,7 +3573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3679,7 +3687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3743,7 +3751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3802,7 +3810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3982,7 +3990,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4036,7 +4044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4150,7 +4158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4214,7 +4222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4273,7 +4281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4453,7 +4461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4507,7 +4515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4685,7 +4693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4744,7 +4752,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4924,7 +4932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4978,7 +4986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5092,7 +5100,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5156,7 +5164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5215,7 +5223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5395,7 +5403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5449,7 +5457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5563,7 +5571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5627,7 +5635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5686,7 +5694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5866,7 +5874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_no_lto_flutter_flutter-3.8-candidate.10.json
index 04d6e7a..3eb2515 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_flutter_flutter-3.8-candidate.10.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3116,7 +3124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3180,7 +3188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3239,7 +3247,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3419,7 +3427,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3473,7 +3481,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3587,7 +3595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3651,7 +3659,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3710,7 +3718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3890,7 +3898,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3944,7 +3952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4058,7 +4066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4122,7 +4130,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4181,7 +4189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4361,7 +4369,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4415,7 +4423,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4593,7 +4601,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4652,7 +4660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4832,7 +4840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4886,7 +4894,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5000,7 +5008,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5064,7 +5072,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5123,7 +5131,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5303,7 +5311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5357,7 +5365,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5471,7 +5479,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5535,7 +5543,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5594,7 +5602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5774,7 +5782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_flutter_main.json b/recipes/engine/engine.expected/win_upload_no_lto_flutter_main.json
index 04d6e7a..3eb2515 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_flutter_main.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_flutter_main.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3116,7 +3124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3180,7 +3188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3239,7 +3247,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3419,7 +3427,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3473,7 +3481,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3587,7 +3595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3651,7 +3659,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3710,7 +3718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3890,7 +3898,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3944,7 +3952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4058,7 +4066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4122,7 +4130,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4181,7 +4189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4361,7 +4369,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4415,7 +4423,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4593,7 +4601,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4652,7 +4660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4832,7 +4840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4886,7 +4894,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5000,7 +5008,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5064,7 +5072,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5123,7 +5131,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5303,7 +5311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5357,7 +5365,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5471,7 +5479,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5535,7 +5543,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5594,7 +5602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5774,7 +5782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
index 04d6e7a..3eb2515 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_flutter-3.8-candidate.10.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3116,7 +3124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3180,7 +3188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3239,7 +3247,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3419,7 +3427,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3473,7 +3481,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3587,7 +3595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3651,7 +3659,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3710,7 +3718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3890,7 +3898,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3944,7 +3952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4058,7 +4066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4122,7 +4130,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4181,7 +4189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4361,7 +4369,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4415,7 +4423,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4593,7 +4601,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4652,7 +4660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4832,7 +4840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4886,7 +4894,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5000,7 +5008,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5064,7 +5072,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5123,7 +5131,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5303,7 +5311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5357,7 +5365,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5471,7 +5479,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5535,7 +5543,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5594,7 +5602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5774,7 +5782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_main.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_main.json
index 04d6e7a..3eb2515 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_main.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_flutter_main.json
@@ -709,12 +709,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -722,8 +729,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -773,19 +780,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -800,7 +804,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -850,7 +854,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -860,9 +864,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -916,7 +920,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -924,7 +928,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -934,7 +938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1054,7 +1058,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1118,7 +1122,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1177,7 +1181,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1357,12 +1361,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1370,8 +1381,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1412,19 +1423,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1439,7 +1447,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1480,7 +1488,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1490,9 +1498,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1537,7 +1545,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1545,7 +1553,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1555,7 +1563,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1709,7 +1717,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1825,7 +1833,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1889,7 +1897,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1948,7 +1956,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2128,7 +2136,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2231,7 +2239,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2347,7 +2355,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2411,7 +2419,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2470,7 +2478,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2650,7 +2658,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3002,7 +3010,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3116,7 +3124,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3180,7 +3188,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3239,7 +3247,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3419,7 +3427,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3473,7 +3481,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3587,7 +3595,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3651,7 +3659,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3710,7 +3718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3890,7 +3898,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -3944,7 +3952,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4058,7 +4066,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4122,7 +4130,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4181,7 +4189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4361,7 +4369,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4415,7 +4423,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4529,7 +4537,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4593,7 +4601,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4652,7 +4660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4832,7 +4840,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4886,7 +4894,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5000,7 +5008,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5064,7 +5072,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5123,7 +5131,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5303,7 +5311,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5357,7 +5365,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5471,7 +5479,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5535,7 +5543,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5594,7 +5602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5774,7 +5782,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
index 21ec6d6..bb23473 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3532,7 +3540,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3646,7 +3654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3710,7 +3718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3769,7 +3777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3949,7 +3957,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -4003,7 +4011,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4117,7 +4125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4181,7 +4189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4240,7 +4248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4420,7 +4428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4474,7 +4482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4588,7 +4596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4652,7 +4660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4891,7 +4899,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4945,7 +4953,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5059,7 +5067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5123,7 +5131,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5182,7 +5190,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -5416,7 +5424,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5530,7 +5538,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5594,7 +5602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5653,7 +5661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5833,7 +5841,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5887,7 +5895,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -6001,7 +6009,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6065,7 +6073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -6124,7 +6132,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -6304,7 +6312,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod_main.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod_main.json
index 10a5620..c30793d 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod_main.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_prod_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3532,7 +3540,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3646,7 +3654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3710,7 +3718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3769,7 +3777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3949,7 +3957,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -4003,7 +4011,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4117,7 +4125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4181,7 +4189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4240,7 +4248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4420,7 +4428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4474,7 +4482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4588,7 +4596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4652,7 +4660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4891,7 +4899,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4945,7 +4953,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5059,7 +5067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5123,7 +5131,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5182,7 +5190,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -5416,7 +5424,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5530,7 +5538,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5594,7 +5602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5653,7 +5661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5833,7 +5841,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5887,7 +5895,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -6001,7 +6009,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6065,7 +6073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -6124,7 +6132,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -6304,7 +6312,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
index 8c54713..31a703b 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3100,7 +3108,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3214,7 +3222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3278,7 +3286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3337,7 +3345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3517,7 +3525,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3571,7 +3579,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3685,7 +3693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3808,7 +3816,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3988,7 +3996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4042,7 +4050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4156,7 +4164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4220,7 +4228,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4279,7 +4287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4459,7 +4467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4513,7 +4521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4627,7 +4635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4691,7 +4699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4930,7 +4938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4984,7 +4992,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5098,7 +5106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5162,7 +5170,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5221,7 +5229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5401,7 +5409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5633,7 +5641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5692,7 +5700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5872,7 +5880,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging_main.json b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging_main.json
index a1a1448..f2e9120 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging_main.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_font_subset_staging_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3100,7 +3108,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3214,7 +3222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3278,7 +3286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3337,7 +3345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3517,7 +3525,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3571,7 +3579,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3685,7 +3693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3808,7 +3816,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3988,7 +3996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4042,7 +4050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4156,7 +4164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4220,7 +4228,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4279,7 +4287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4459,7 +4467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4513,7 +4521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4627,7 +4635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4691,7 +4699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4930,7 +4938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4984,7 +4992,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5098,7 +5106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5162,7 +5170,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5221,7 +5229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5401,7 +5409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5633,7 +5641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5692,7 +5700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5872,7 +5880,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_no_lto_prod_flutter-3.8-candidate.10.json
index 21ec6d6..bb23473 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_prod_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3532,7 +3540,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3646,7 +3654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3710,7 +3718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3769,7 +3777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3949,7 +3957,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -4003,7 +4011,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4117,7 +4125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4181,7 +4189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4240,7 +4248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4420,7 +4428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4474,7 +4482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4588,7 +4596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4652,7 +4660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4891,7 +4899,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4945,7 +4953,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5059,7 +5067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5123,7 +5131,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5182,7 +5190,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -5416,7 +5424,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5530,7 +5538,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5594,7 +5602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5653,7 +5661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5833,7 +5841,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5887,7 +5895,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -6001,7 +6009,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6065,7 +6073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -6124,7 +6132,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -6304,7 +6312,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_prod_main.json b/recipes/engine/engine.expected/win_upload_no_lto_prod_main.json
index 10a5620..c30793d 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_prod_main.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_prod_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3532,7 +3540,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3646,7 +3654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3710,7 +3718,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3769,7 +3777,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3949,7 +3957,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -4003,7 +4011,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4117,7 +4125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4181,7 +4189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4240,7 +4248,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4420,7 +4428,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4474,7 +4482,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4588,7 +4596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4652,7 +4660,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4711,7 +4719,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4891,7 +4899,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4945,7 +4953,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5059,7 +5067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5123,7 +5131,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5182,7 +5190,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5362,7 +5370,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -5416,7 +5424,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5530,7 +5538,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5594,7 +5602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5653,7 +5661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5833,7 +5841,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5887,7 +5895,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -6001,7 +6009,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6065,7 +6073,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -6124,7 +6132,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -6304,7 +6312,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_no_lto_staging_flutter-3.8-candidate.10.json
index 8c54713..31a703b 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_staging_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3100,7 +3108,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3214,7 +3222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3278,7 +3286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3337,7 +3345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3517,7 +3525,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3571,7 +3579,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3685,7 +3693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3808,7 +3816,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3988,7 +3996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4042,7 +4050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4156,7 +4164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4220,7 +4228,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4279,7 +4287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4459,7 +4467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4513,7 +4521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4627,7 +4635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4691,7 +4699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4930,7 +4938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4984,7 +4992,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5098,7 +5106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5162,7 +5170,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5221,7 +5229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5401,7 +5409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5633,7 +5641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5692,7 +5700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5872,7 +5880,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_no_lto_staging_main.json b/recipes/engine/engine.expected/win_upload_no_lto_staging_main.json
index a1a1448..f2e9120 100644
--- a/recipes/engine/engine.expected/win_upload_no_lto_staging_main.json
+++ b/recipes/engine/engine.expected/win_upload_no_lto_staging_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3100,7 +3108,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3214,7 +3222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3278,7 +3286,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3337,7 +3345,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3517,7 +3525,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3571,7 +3579,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3685,7 +3693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3749,7 +3757,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3808,7 +3816,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3988,7 +3996,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4042,7 +4050,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4156,7 +4164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4220,7 +4228,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4279,7 +4287,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4459,7 +4467,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4513,7 +4521,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4627,7 +4635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4691,7 +4699,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4750,7 +4758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4930,7 +4938,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4984,7 +4992,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5098,7 +5106,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5162,7 +5170,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5221,7 +5229,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5401,7 +5409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5455,7 +5463,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5569,7 +5577,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5633,7 +5641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5692,7 +5700,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5872,7 +5880,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_prod_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_prod_flutter-3.8-candidate.10.json
index 17c5896..99e5571 100644
--- a/recipes/engine/engine.expected/win_upload_prod_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_prod_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3526,7 +3534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3704,7 +3712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3763,7 +3771,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3943,7 +3951,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3997,7 +4005,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4111,7 +4119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4234,7 +4242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4414,7 +4422,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4468,7 +4476,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4582,7 +4590,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4646,7 +4654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4705,7 +4713,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4885,7 +4893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4939,7 +4947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5053,7 +5061,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5117,7 +5125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5176,7 +5184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5356,7 +5364,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -5410,7 +5418,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5524,7 +5532,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5588,7 +5596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5647,7 +5655,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5827,7 +5835,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5881,7 +5889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5995,7 +6003,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6059,7 +6067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -6118,7 +6126,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -6298,7 +6306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_prod_main.json b/recipes/engine/engine.expected/win_upload_prod_main.json
index 0c1c517..46d2cb1 100644
--- a/recipes/engine/engine.expected/win_upload_prod_main.json
+++ b/recipes/engine/engine.expected/win_upload_prod_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3526,7 +3534,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3640,7 +3648,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3704,7 +3712,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3763,7 +3771,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3943,7 +3951,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3997,7 +4005,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4111,7 +4119,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4175,7 +4183,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4234,7 +4242,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4414,7 +4422,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4468,7 +4476,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4582,7 +4590,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4646,7 +4654,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4705,7 +4713,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4885,7 +4893,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4939,7 +4947,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5053,7 +5061,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5117,7 +5125,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5176,7 +5184,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5356,7 +5364,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -5410,7 +5418,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5524,7 +5532,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5588,7 +5596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5647,7 +5655,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5827,7 +5835,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5881,7 +5889,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5995,7 +6003,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -6059,7 +6067,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -6118,7 +6126,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -6298,7 +6306,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_staging_flutter-3.8-candidate.10.json b/recipes/engine/engine.expected/win_upload_staging_flutter-3.8-candidate.10.json
index 698afdb..7127d5d 100644
--- a/recipes/engine/engine.expected/win_upload_staging_flutter-3.8-candidate.10.json
+++ b/recipes/engine/engine.expected/win_upload_staging_flutter-3.8-candidate.10.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3094,7 +3102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3208,7 +3216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3272,7 +3280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3331,7 +3339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3511,7 +3519,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3565,7 +3573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3679,7 +3687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3743,7 +3751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3802,7 +3810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3982,7 +3990,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4036,7 +4044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4150,7 +4158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4214,7 +4222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4273,7 +4281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4453,7 +4461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4507,7 +4515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4685,7 +4693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4744,7 +4752,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4924,7 +4932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4978,7 +4986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5092,7 +5100,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5156,7 +5164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5215,7 +5223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5395,7 +5403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5449,7 +5457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5563,7 +5571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5627,7 +5635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5686,7 +5694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5866,7 +5874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine.expected/win_upload_staging_main.json b/recipes/engine/engine.expected/win_upload_staging_main.json
index dab3f41..e13e910 100644
--- a/recipes/engine/engine.expected/win_upload_staging_main.json
+++ b/recipes/engine/engine.expected/win_upload_staging_main.json
@@ -807,12 +807,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -820,8 +827,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -871,19 +878,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -898,7 +902,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -948,7 +952,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -958,9 +962,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1014,7 +1018,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1022,7 +1026,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1032,7 +1036,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1152,7 +1156,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1216,7 +1220,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -1275,7 +1279,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -1455,12 +1459,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1468,8 +1479,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]\\resources\\cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1510,19 +1521,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1537,7 +1545,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version"
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]\\builder",
     "env": {
@@ -1578,7 +1586,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1588,9 +1596,9 @@
       "cipd.bat",
       "ensure",
       "-root",
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1635,7 +1643,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1643,7 +1651,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1653,7 +1661,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1807,7 +1815,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -1923,7 +1931,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1987,7 +1995,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2046,7 +2054,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2226,7 +2234,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2329,7 +2337,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -2445,7 +2453,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -2509,7 +2517,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -2568,7 +2576,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -2748,7 +2756,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:27.500000\", \"time_stamp_int\": 1337000009000}}"
     ],
@@ -3094,7 +3102,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3208,7 +3216,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3272,7 +3280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3331,7 +3339,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3511,7 +3519,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:30.500000\", \"time_stamp_int\": 1337000012000}}"
     ],
@@ -3565,7 +3573,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -3679,7 +3687,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -3743,7 +3751,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -3802,7 +3810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -3982,7 +3990,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:33.500000\", \"time_stamp_int\": 1337000015000}}"
     ],
@@ -4036,7 +4044,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4150,7 +4158,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4214,7 +4222,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4273,7 +4281,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4453,7 +4461,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:36.500000\", \"time_stamp_int\": 1337000018000}}"
     ],
@@ -4507,7 +4515,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -4621,7 +4629,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -4685,7 +4693,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -4744,7 +4752,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -4924,7 +4932,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:39.500000\", \"time_stamp_int\": 1337000021000}}"
     ],
@@ -4978,7 +4986,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5092,7 +5100,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5156,7 +5164,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5215,7 +5223,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5395,7 +5403,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:42.500000\", \"time_stamp_int\": 1337000024000}}"
     ],
@@ -5449,7 +5457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "restart"
     ],
@@ -5563,7 +5571,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -5627,7 +5635,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stat"
     ],
@@ -5686,7 +5694,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\cpython3\\version%3Apinned-version\\bin\\python3.exe",
+      "[START_DIR]\\cipd_tool\\infra\\3pp\\tools\\cpython3\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bin\\python3.exe",
       "[CACHE]\\goma\\client\\goma_ctl.py",
       "stop"
     ],
@@ -5866,7 +5874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]\\cipd_tool\\path\\to\\bqupload\\version%3Apinned-version\\bqupload",
+      "[START_DIR]\\cipd_tool\\infra\\tools\\bqupload\\0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07\\bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Win Engine\", \"time_stamp\": \"2012-05-14 12:53:45.500000\", \"time_stamp_int\": 1337000027000}}"
     ],
diff --git a/recipes/engine/engine_builder.expected/Schedule two builds one with goma and one without.json b/recipes/engine/engine_builder.expected/Schedule two builds one with goma and one without.json
index 3c25250..298cbe0 100644
--- a/recipes/engine/engine_builder.expected/Schedule two builds one with goma and one without.json
+++ b/recipes/engine/engine_builder.expected/Schedule two builds one with goma and one without.json
@@ -409,12 +409,19 @@
   },
   {
     "cmd": [],
-    "name": "build host_debug_unopt ().setup goma.ensure cpython3",
+    "name": "build host_debug_unopt ().setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "build host_debug_unopt ().setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -422,8 +429,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -460,19 +467,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug_unopt ().setup goma.ensure cpython3.read manifest",
+    "name": "build host_debug_unopt ().setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@4@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "build host_debug_unopt ().setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "build host_debug_unopt ().setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -487,7 +491,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -524,7 +528,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug_unopt ().setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "build host_debug_unopt ().setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@"
     ]
@@ -534,9 +538,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -577,7 +581,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug_unopt ().setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "build host_debug_unopt ().setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -585,7 +589,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -595,7 +599,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -685,7 +689,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -736,7 +740,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -782,7 +786,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -925,12 +929,19 @@
   },
   {
     "cmd": [],
-    "name": "build host_debug_unopt ().teardown goma.ensure bqupload",
+    "name": "build host_debug_unopt ().teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "build host_debug_unopt ().teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -938,8 +949,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -968,19 +979,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug_unopt ().teardown goma.ensure bqupload.read manifest",
+    "name": "build host_debug_unopt ().teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@4@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "build host_debug_unopt ().teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "build host_debug_unopt ().teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -995,7 +1003,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1024,7 +1032,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug_unopt ().teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "build host_debug_unopt ().teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@"
     ]
@@ -1034,9 +1042,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1069,7 +1077,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "build host_debug_unopt ().teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "build host_debug_unopt ().teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1077,7 +1085,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1087,7 +1095,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"Linux Drone\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1383,7 +1391,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "infra_step": true,
@@ -1409,7 +1417,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1449,7 +1457,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/femu_test.expected/arm64_emulator_arch.json b/recipes/engine/femu_test.expected/arm64_emulator_arch.json
index 7e46a2c..c21987a 100644
--- a/recipes/engine/femu_test.expected/arm64_emulator_arch.json
+++ b/recipes/engine/femu_test.expected/arm64_emulator_arch.json
@@ -315,12 +315,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -328,8 +335,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -359,19 +366,16 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -386,7 +390,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -416,7 +420,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -426,9 +430,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -462,7 +466,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -470,7 +474,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -480,7 +484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -554,7 +558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -598,7 +602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -637,7 +641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -754,7 +758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -828,7 +832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -872,7 +876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -911,7 +915,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1293,7 +1297,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1323,7 +1327,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1367,7 +1371,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/femu_test.expected/dangerous_test_commands.json b/recipes/engine/femu_test.expected/dangerous_test_commands.json
index e61cbbd..c145fb8 100644
--- a/recipes/engine/femu_test.expected/dangerous_test_commands.json
+++ b/recipes/engine/femu_test.expected/dangerous_test_commands.json
@@ -315,12 +315,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -328,8 +335,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -359,19 +366,16 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -386,7 +390,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -416,7 +420,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -426,9 +430,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -462,7 +466,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -470,7 +474,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -480,7 +484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -554,7 +558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -598,7 +602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -637,7 +641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -754,7 +758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -828,7 +832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -872,7 +876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -911,7 +915,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
diff --git a/recipes/engine/femu_test.expected/femu_with_package_list.json b/recipes/engine/femu_test.expected/femu_with_package_list.json
index 6f45786..c6c7581 100644
--- a/recipes/engine/femu_test.expected/femu_with_package_list.json
+++ b/recipes/engine/femu_test.expected/femu_with_package_list.json
@@ -315,12 +315,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -328,8 +335,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -359,19 +366,16 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -386,7 +390,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -416,7 +420,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -426,9 +430,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -462,7 +466,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -470,7 +474,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -480,7 +484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -554,7 +558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -598,7 +602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -637,7 +641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -754,7 +758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -828,7 +832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -872,7 +876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -911,7 +915,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1306,7 +1310,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1336,7 +1340,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1380,7 +1384,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/femu_test.expected/invalid_emulator_arch.json b/recipes/engine/femu_test.expected/invalid_emulator_arch.json
index a6964fc..86c1edd 100644
--- a/recipes/engine/femu_test.expected/invalid_emulator_arch.json
+++ b/recipes/engine/femu_test.expected/invalid_emulator_arch.json
@@ -315,12 +315,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -328,8 +335,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -359,19 +366,16 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -386,7 +390,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -416,7 +420,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -426,9 +430,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -462,7 +466,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -470,7 +474,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -480,7 +484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -554,7 +558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -598,7 +602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -637,7 +641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -754,7 +758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -828,7 +832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -872,7 +876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -911,7 +915,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1286,7 +1290,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1316,7 +1320,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1360,7 +1364,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/femu_test.expected/multiple_non_root_fars.json b/recipes/engine/femu_test.expected/multiple_non_root_fars.json
index ab0137d..872a203 100644
--- a/recipes/engine/femu_test.expected/multiple_non_root_fars.json
+++ b/recipes/engine/femu_test.expected/multiple_non_root_fars.json
@@ -315,12 +315,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -328,8 +335,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -359,19 +366,16 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -386,7 +390,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -416,7 +420,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -426,9 +430,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -462,7 +466,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -470,7 +474,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -480,7 +484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -554,7 +558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -598,7 +602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -637,7 +641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -754,7 +758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -828,7 +832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -872,7 +876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -911,7 +915,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1296,7 +1300,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1326,7 +1330,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1370,7 +1374,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/femu_test.expected/no_zircon_file.json b/recipes/engine/femu_test.expected/no_zircon_file.json
index a6964fc..86c1edd 100644
--- a/recipes/engine/femu_test.expected/no_zircon_file.json
+++ b/recipes/engine/femu_test.expected/no_zircon_file.json
@@ -315,12 +315,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -328,8 +335,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -359,19 +366,16 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -386,7 +390,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -416,7 +420,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -426,9 +430,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -462,7 +466,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -470,7 +474,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -480,7 +484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -554,7 +558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -598,7 +602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -637,7 +641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -754,7 +758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -828,7 +832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -872,7 +876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -911,7 +915,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1286,7 +1290,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1316,7 +1320,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1360,7 +1364,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/femu_test.expected/run_on_test_specified_arch.json b/recipes/engine/femu_test.expected/run_on_test_specified_arch.json
index ebe79bb..f1332c2 100644
--- a/recipes/engine/femu_test.expected/run_on_test_specified_arch.json
+++ b/recipes/engine/femu_test.expected/run_on_test_specified_arch.json
@@ -315,12 +315,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -328,8 +335,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -359,19 +366,16 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -386,7 +390,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -416,7 +420,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -426,9 +430,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -462,7 +466,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -470,7 +474,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -480,7 +484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -554,7 +558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -598,7 +602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -637,7 +641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -754,7 +758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -828,7 +832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -872,7 +876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -911,7 +915,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1324,7 +1328,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1354,7 +1358,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1398,7 +1402,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/femu_test.expected/run_test_with_retry.json b/recipes/engine/femu_test.expected/run_test_with_retry.json
index 6a57192..3e1c47d 100644
--- a/recipes/engine/femu_test.expected/run_test_with_retry.json
+++ b/recipes/engine/femu_test.expected/run_test_with_retry.json
@@ -315,12 +315,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -328,8 +335,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -359,19 +366,16 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -386,7 +390,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -416,7 +420,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -426,9 +430,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -462,7 +466,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -470,7 +474,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -480,7 +484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -554,7 +558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -598,7 +602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -637,7 +641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -754,7 +758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -828,7 +832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -872,7 +876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -911,7 +915,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1302,7 +1306,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1332,7 +1336,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1376,7 +1380,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/femu_test.expected/run_with_dart_aot_behavior.json b/recipes/engine/femu_test.expected/run_with_dart_aot_behavior.json
index ec3f5e8..a9a0f5d 100644
--- a/recipes/engine/femu_test.expected/run_with_dart_aot_behavior.json
+++ b/recipes/engine/femu_test.expected/run_with_dart_aot_behavior.json
@@ -315,12 +315,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -328,8 +335,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -359,19 +366,16 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -386,7 +390,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -416,7 +420,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -426,9 +430,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -462,7 +466,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -470,7 +474,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -480,7 +484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -554,7 +558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -598,7 +602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -637,7 +641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -754,7 +758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -828,7 +832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -872,7 +876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -911,7 +915,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1299,7 +1303,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1329,7 +1333,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1373,7 +1377,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/femu_test.expected/start_femu.json b/recipes/engine/femu_test.expected/start_femu.json
index 238ef5b..0482818 100644
--- a/recipes/engine/femu_test.expected/start_femu.json
+++ b/recipes/engine/femu_test.expected/start_femu.json
@@ -315,12 +315,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -328,8 +335,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -359,19 +366,16 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -386,7 +390,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -416,7 +420,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -426,9 +430,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -462,7 +466,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -470,7 +474,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -480,7 +484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -554,7 +558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -598,7 +602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -637,7 +641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -754,7 +758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -828,7 +832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -872,7 +876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -911,7 +915,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1298,7 +1302,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1328,7 +1332,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1372,7 +1376,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/femu_test.expected/start_femu_with_cso.json b/recipes/engine/femu_test.expected/start_femu_with_cso.json
index faacfee..e11660e 100644
--- a/recipes/engine/femu_test.expected/start_femu_with_cso.json
+++ b/recipes/engine/femu_test.expected/start_femu_with_cso.json
@@ -315,12 +315,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -328,8 +335,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -359,19 +366,16 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -386,7 +390,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -416,7 +420,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -426,9 +430,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -462,7 +466,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -470,7 +474,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -480,7 +484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -554,7 +558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -598,7 +602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -637,7 +641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -754,7 +758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -828,7 +832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -872,7 +876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -911,7 +915,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1298,7 +1302,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1328,7 +1332,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1372,7 +1376,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/femu_test.expected/start_femu_with_override_pbm.json b/recipes/engine/femu_test.expected/start_femu_with_override_pbm.json
index 9fb6ef0..646478d 100644
--- a/recipes/engine/femu_test.expected/start_femu_with_override_pbm.json
+++ b/recipes/engine/femu_test.expected/start_femu_with_override_pbm.json
@@ -315,12 +315,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -328,8 +335,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -359,19 +366,16 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -386,7 +390,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -416,7 +420,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -426,9 +430,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -462,7 +466,7 @@
       ]
     },
     "infra_step": true,
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -470,7 +474,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -480,7 +484,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -554,7 +558,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -598,7 +602,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -637,7 +641,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -754,7 +758,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -828,7 +832,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -872,7 +876,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -911,7 +915,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1298,7 +1302,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1328,7 +1332,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -1372,7 +1376,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine/framework_smoke.expected/basic.json b/recipes/engine/framework_smoke.expected/basic.json
index 3079ecd..5e6e556 100644
--- a/recipes/engine/framework_smoke.expected/basic.json
+++ b/recipes/engine/framework_smoke.expected/basic.json
@@ -232,12 +232,19 @@
   },
   {
     "cmd": [],
-    "name": "Build host_debug_unopt.setup goma.ensure cpython3",
+    "name": "Build host_debug_unopt.setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "Build host_debug_unopt.setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -245,8 +252,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -261,19 +268,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "Build host_debug_unopt.setup goma.ensure cpython3.read manifest",
+    "name": "Build host_debug_unopt.setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@4@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "Build host_debug_unopt.setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "Build host_debug_unopt.setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -288,7 +292,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -303,7 +307,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "Build host_debug_unopt.setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "Build host_debug_unopt.setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@"
     ]
@@ -313,9 +317,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -334,7 +338,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "Build host_debug_unopt.setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "Build host_debug_unopt.setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -342,7 +346,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -352,7 +356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -408,7 +412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -437,7 +441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -461,7 +465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -536,7 +540,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -592,7 +596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -621,7 +625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -645,7 +649,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
diff --git a/recipes/engine/framework_smoke.expected/no_goma.json b/recipes/engine/framework_smoke.expected/no_goma.json
index 3079ecd..5e6e556 100644
--- a/recipes/engine/framework_smoke.expected/no_goma.json
+++ b/recipes/engine/framework_smoke.expected/no_goma.json
@@ -232,12 +232,19 @@
   },
   {
     "cmd": [],
-    "name": "Build host_debug_unopt.setup goma.ensure cpython3",
+    "name": "Build host_debug_unopt.setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "Build host_debug_unopt.setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@3@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -245,8 +252,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -261,19 +268,16 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "Build host_debug_unopt.setup goma.ensure cpython3.read manifest",
+    "name": "Build host_debug_unopt.setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@3@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@4@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "Build host_debug_unopt.setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "Build host_debug_unopt.setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -288,7 +292,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "GLOG_log_dir": "[CLEANUP]",
@@ -303,7 +307,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "Build host_debug_unopt.setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "Build host_debug_unopt.setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@"
     ]
@@ -313,9 +317,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -334,7 +338,7 @@
       "GOMA_USE_LOCAL": "False"
     },
     "infra_step": true,
-    "name": "Build host_debug_unopt.setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "Build host_debug_unopt.setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@4@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -342,7 +346,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -352,7 +356,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -408,7 +412,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -437,7 +441,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -461,7 +465,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -536,7 +540,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -592,7 +596,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -621,7 +625,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -645,7 +649,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
diff --git a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
index 4aee8d2..d24b0e8 100644
--- a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
+++ b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
@@ -639,12 +639,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -652,8 +659,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -708,19 +715,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -735,7 +739,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -790,7 +794,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -800,9 +804,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -861,7 +865,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -869,7 +873,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -879,7 +883,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1003,7 +1007,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1072,7 +1076,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1136,7 +1140,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1333,12 +1337,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1346,8 +1357,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1394,19 +1405,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1421,7 +1429,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -1468,7 +1476,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1478,9 +1486,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1531,7 +1539,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1539,7 +1547,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1549,7 +1557,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1609,7 +1617,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1733,7 +1741,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1802,7 +1810,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1866,7 +1874,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -2063,7 +2071,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"builder\", \"time_stamp\": \"2012-05-14 12:53:24.500000\", \"time_stamp_int\": 1337000006000}}"
     ],
@@ -2303,7 +2311,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder",
     "env": {
@@ -2358,7 +2366,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -2427,7 +2435,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json
index fddf0d1..1402924 100644
--- a/recipes/engine_v2/builder.expected/basic.json
+++ b/recipes/engine_v2/builder.expected/basic.json
@@ -390,12 +390,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -403,8 +410,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -450,19 +457,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -477,7 +481,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -523,7 +527,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -533,9 +537,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -585,7 +589,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -593,7 +597,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -603,7 +607,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -716,7 +720,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -776,7 +780,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -831,7 +835,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1001,12 +1005,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1014,8 +1025,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1053,19 +1064,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1080,7 +1088,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1118,7 +1126,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1128,9 +1136,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1172,7 +1180,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1180,7 +1188,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1190,7 +1198,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"linux-host\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1249,7 +1257,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1295,7 +1303,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411",
       "-ensure-file",
       "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
       "-max-threads",
@@ -1407,8 +1415,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/reproxy"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
+      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/reproxy"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1534,7 +1542,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
       "--shutdown"
     ],
     "env": {
@@ -3570,7 +3578,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -3595,7 +3603,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -3634,7 +3642,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine_v2/builder.expected/config_file.json b/recipes/engine_v2/builder.expected/config_file.json
index 1d91a4f..64cd2c2 100644
--- a/recipes/engine_v2/builder.expected/config_file.json
+++ b/recipes/engine_v2/builder.expected/config_file.json
@@ -417,7 +417,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -442,7 +442,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -481,7 +481,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
index 031ff39..6434890 100644
--- a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
+++ b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
@@ -30,7 +30,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -54,7 +54,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
@@ -454,7 +454,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -500,7 +500,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411",
       "-ensure-file",
       "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
       "-max-threads",
@@ -612,8 +612,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/reproxy"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
+      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/reproxy"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -739,7 +739,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
       "--shutdown"
     ],
     "env": {
@@ -5491,7 +5491,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -5516,7 +5516,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -5555,7 +5555,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index dc083fa..8e5cba9 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -744,12 +744,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -757,8 +764,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -804,19 +811,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -831,7 +835,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -877,7 +881,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -887,9 +891,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -939,7 +943,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -947,7 +951,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -957,7 +961,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -1070,7 +1074,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -1130,7 +1134,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -1185,7 +1189,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1355,12 +1359,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1368,8 +1379,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1407,19 +1418,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1434,7 +1442,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1472,7 +1480,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1482,9 +1490,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1526,7 +1534,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1534,7 +1542,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1544,7 +1552,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"mac-host\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1603,7 +1611,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1649,7 +1657,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411",
       "-ensure-file",
       "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
       "-max-threads",
@@ -1761,8 +1769,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/reproxy"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
+      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/reproxy"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/src/third_party/android_tools/sdk",
@@ -1888,7 +1896,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
       "--shutdown"
     ],
     "env": {
@@ -5339,7 +5347,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -5364,7 +5372,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -5403,7 +5411,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine_v2/builder.expected/monorepo.json b/recipes/engine_v2/builder.expected/monorepo.json
index 8533967..66fce55 100644
--- a/recipes/engine_v2/builder.expected/monorepo.json
+++ b/recipes/engine_v2/builder.expected/monorepo.json
@@ -378,12 +378,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -391,8 +398,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -437,19 +444,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -464,7 +468,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -509,7 +513,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -519,9 +523,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -570,7 +574,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -578,7 +582,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -588,7 +592,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -700,7 +704,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -759,7 +763,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -813,7 +817,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -980,12 +984,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -993,8 +1004,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1031,19 +1042,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1058,7 +1066,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1095,7 +1103,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1105,9 +1113,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1148,7 +1156,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1156,7 +1164,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1166,7 +1174,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"monorepo_builder\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1224,7 +1232,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1269,7 +1277,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411",
       "-ensure-file",
       "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
       "-max-threads",
@@ -1379,8 +1387,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/reproxy"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
+      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/reproxy"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1504,7 +1512,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
       "--shutdown"
     ],
     "env": {
@@ -3276,7 +3284,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -3301,7 +3309,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -3340,7 +3348,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine_v2/builder.expected/monorepo_tryjob.json b/recipes/engine_v2/builder.expected/monorepo_tryjob.json
index b636f03..0322ca1 100644
--- a/recipes/engine_v2/builder.expected/monorepo_tryjob.json
+++ b/recipes/engine_v2/builder.expected/monorepo_tryjob.json
@@ -465,12 +465,19 @@
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -478,8 +485,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::python3]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::python3]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -524,19 +531,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.read manifest",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/cpython3\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/cpython3/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "setup goma.ensure cpython3.install path/to/cpython3",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -551,7 +555,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -596,7 +600,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure package directory",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -606,9 +610,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/cpython3 version:pinned-version",
+      "infra/3pp/tools/cpython3/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -657,7 +661,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "setup goma.ensure cpython3.install path/to/cpython3.ensure_installed",
+    "name": "setup goma.ensure infra/3pp/tools/cpython3/${platform}.install infra/3pp/tools/cpython3.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -665,7 +669,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/cpython3\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/cpython3/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -675,7 +679,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "restart"
     ],
@@ -787,7 +791,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "jsonstatus",
       "/path/to/tmp/json"
@@ -846,7 +850,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stat"
     ],
@@ -900,7 +904,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/cpython3/version%3Apinned-version/bin/python3",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/cpython3/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/python3",
       "[CACHE]/goma/client/goma_ctl.py",
       "stop"
     ],
@@ -1067,12 +1071,19 @@
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -1080,8 +1091,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::bqupload]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::bqupload]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1118,19 +1129,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.read manifest",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/bqupload\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/bqupload/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1145,7 +1153,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1182,7 +1190,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure package directory",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -1192,9 +1200,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/bqupload version:pinned-version",
+      "infra/tools/bqupload/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1235,7 +1243,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "teardown goma.ensure bqupload.install path/to/bqupload.ensure_installed",
+    "name": "teardown goma.ensure infra/tools/bqupload/${platform}.install infra/tools/bqupload.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1243,7 +1251,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/bqupload\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/bqupload/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1253,7 +1261,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/bqupload/version%3Apinned-version/bqupload",
+      "[START_DIR]/cipd_tool/infra/tools/bqupload/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bqupload",
       "fuchsia-infra.artifacts.builds_beta_goma",
       "{\"build_info\": {\"build_id\": 8945511751514863184, \"builder\": \"monorepo_builder_try\", \"time_stamp\": \"2012-05-14 12:53:21.500000\", \"time_stamp_int\": 1337000003000}}"
     ],
@@ -1311,7 +1319,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1356,7 +1364,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411",
       "-ensure-file",
       "infra/rbe/client/${platform} re_client_version:0.111.0.1ccaa23-gomaip",
       "-max-threads",
@@ -1466,8 +1474,8 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
-      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/reproxy"
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
+      "--re_proxy=[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/reproxy"
     ],
     "env": {
       "ANDROID_HOME": "[CACHE]/builder/engine/src/third_party/android_tools/sdk",
@@ -1591,7 +1599,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/rbe/client/re_client_version%3A0.111.0.1ccaa23-gomaip/bootstrap",
+      "[START_DIR]/cipd_tool/infra/rbe/client/d6057ebe22e9abfffdb036fed4230c3cba200a807fedd3720bced58c28ebe411/bootstrap",
       "--shutdown"
     ],
     "env": {
@@ -3313,7 +3321,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "luci_context": {
@@ -3338,7 +3346,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -3377,7 +3385,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine_v2/cache.expected/basic.json b/recipes/engine_v2/cache.expected/basic.json
index 5f8bc21..acaed19 100644
--- a/recipes/engine_v2/cache.expected/basic.json
+++ b/recipes/engine_v2/cache.expected/basic.json
@@ -277,7 +277,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "infra_step": true,
     "name": "install infra/tools/luci/cas.ensure package directory",
@@ -290,7 +290,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -317,7 +317,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -334,7 +334,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "archive",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
index b865333..31199e8 100644
--- a/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
+++ b/recipes/engine_v2/engine_v2.expected/basic_mac_dart_internal.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/engine_v2/tester_engine.expected/basic.json b/recipes/engine_v2/tester_engine.expected/basic.json
index 213f37c..0410654 100644
--- a/recipes/engine_v2/tester_engine.expected/basic.json
+++ b/recipes/engine_v2/tester_engine.expected/basic.json
@@ -444,7 +444,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[CACHE]/builder/src/flutter",
     "env": {
@@ -487,7 +487,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -544,7 +544,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
@@ -588,7 +588,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/firebaselab/firebaselab.expected/basic.json b/recipes/firebaselab/firebaselab.expected/basic.json
index 4a0050f..62c15c1 100644
--- a/recipes/firebaselab/firebaselab.expected/basic.json
+++ b/recipes/firebaselab/firebaselab.expected/basic.json
@@ -197,12 +197,19 @@
   },
   {
     "cmd": [],
-    "name": "test_execution.ensure gcloud",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -210,8 +217,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gcloud]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gcloud]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
     "env": {
@@ -233,19 +240,16 @@
       ]
     },
     "infra_step": true,
-    "name": "test_execution.ensure gcloud.read manifest",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gcloud\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gcloud/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "test_execution.ensure gcloud.install path/to/gcloud",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -260,7 +264,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
     "env": {
@@ -282,7 +286,7 @@
       ]
     },
     "infra_step": true,
-    "name": "test_execution.ensure gcloud.install path/to/gcloud.ensure package directory",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -292,9 +296,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gcloud version:pinned-version",
+      "infra/3pp/tools/gcloud/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -320,7 +324,7 @@
       ]
     },
     "infra_step": true,
-    "name": "test_execution.ensure gcloud.install path/to/gcloud.ensure_installed",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -328,7 +332,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gcloud\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/gcloud/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -338,7 +342,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/gcloud",
       "--quiet",
       "config",
       "set",
@@ -404,7 +408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/gcloud",
       "firebase",
       "test",
       "android",
diff --git a/recipes/firebaselab/firebaselab.expected/empty_devices.json b/recipes/firebaselab/firebaselab.expected/empty_devices.json
index 4a0050f..62c15c1 100644
--- a/recipes/firebaselab/firebaselab.expected/empty_devices.json
+++ b/recipes/firebaselab/firebaselab.expected/empty_devices.json
@@ -197,12 +197,19 @@
   },
   {
     "cmd": [],
-    "name": "test_execution.ensure gcloud",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -210,8 +217,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gcloud]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gcloud]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
     "env": {
@@ -233,19 +240,16 @@
       ]
     },
     "infra_step": true,
-    "name": "test_execution.ensure gcloud.read manifest",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gcloud\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gcloud/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "test_execution.ensure gcloud.install path/to/gcloud",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -260,7 +264,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
     "env": {
@@ -282,7 +286,7 @@
       ]
     },
     "infra_step": true,
-    "name": "test_execution.ensure gcloud.install path/to/gcloud.ensure package directory",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -292,9 +296,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gcloud version:pinned-version",
+      "infra/3pp/tools/gcloud/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -320,7 +324,7 @@
       ]
     },
     "infra_step": true,
-    "name": "test_execution.ensure gcloud.install path/to/gcloud.ensure_installed",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -328,7 +332,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gcloud\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/gcloud/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -338,7 +342,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/gcloud",
       "--quiet",
       "config",
       "set",
@@ -404,7 +408,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/gcloud",
       "firebase",
       "test",
       "android",
diff --git a/recipes/firebaselab/firebaselab.expected/failure 10.json b/recipes/firebaselab/firebaselab.expected/failure 10.json
index 7fd34de..f6e366e 100644
--- a/recipes/firebaselab/firebaselab.expected/failure 10.json
+++ b/recipes/firebaselab/firebaselab.expected/failure 10.json
@@ -196,12 +196,19 @@
   },
   {
     "cmd": [],
-    "name": "test_execution.ensure gcloud",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -209,8 +216,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gcloud]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gcloud]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[START_DIR]/flutter/dev/integration_tests",
     "env": {
@@ -232,19 +239,16 @@
       ]
     },
     "infra_step": true,
-    "name": "test_execution.ensure gcloud.read manifest",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gcloud\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gcloud/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "test_execution.ensure gcloud.install path/to/gcloud",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -259,7 +263,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[START_DIR]/flutter/dev/integration_tests",
     "env": {
@@ -281,7 +285,7 @@
       ]
     },
     "infra_step": true,
-    "name": "test_execution.ensure gcloud.install path/to/gcloud.ensure package directory",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -291,9 +295,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gcloud version:pinned-version",
+      "infra/3pp/tools/gcloud/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -319,7 +323,7 @@
       ]
     },
     "infra_step": true,
-    "name": "test_execution.ensure gcloud.install path/to/gcloud.ensure_installed",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -327,7 +331,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gcloud\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/gcloud/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -337,7 +341,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/gcloud",
       "--quiet",
       "config",
       "set",
@@ -403,7 +407,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/gcloud",
       "firebase",
       "test",
       "android",
diff --git a/recipes/firebaselab/firebaselab.expected/succeed_on_infra_failure.json b/recipes/firebaselab/firebaselab.expected/succeed_on_infra_failure.json
index c851865..3613e8c 100644
--- a/recipes/firebaselab/firebaselab.expected/succeed_on_infra_failure.json
+++ b/recipes/firebaselab/firebaselab.expected/succeed_on_infra_failure.json
@@ -198,12 +198,19 @@
   },
   {
     "cmd": [],
-    "name": "test_execution.ensure gcloud",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -211,8 +218,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gcloud]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gcloud]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[START_DIR]/flutter/dev/integration_tests",
     "env": {
@@ -234,19 +241,16 @@
       ]
     },
     "infra_step": true,
-    "name": "test_execution.ensure gcloud.read manifest",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gcloud\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/3pp/tools/gcloud/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "test_execution.ensure gcloud.install path/to/gcloud",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -261,7 +265,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[START_DIR]/flutter/dev/integration_tests",
     "env": {
@@ -283,7 +287,7 @@
       ]
     },
     "infra_step": true,
-    "name": "test_execution.ensure gcloud.install path/to/gcloud.ensure package directory",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -293,9 +297,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gcloud version:pinned-version",
+      "infra/3pp/tools/gcloud/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -321,7 +325,7 @@
       ]
     },
     "infra_step": true,
-    "name": "test_execution.ensure gcloud.install path/to/gcloud.ensure_installed",
+    "name": "test_execution.ensure infra/3pp/tools/gcloud/${platform}.install infra/3pp/tools/gcloud.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -329,7 +333,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gcloud\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/3pp/tools/gcloud/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -339,7 +343,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/gcloud",
       "--quiet",
       "config",
       "set",
@@ -405,7 +409,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/gcloud",
       "firebase",
       "test",
       "android",
@@ -448,7 +452,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/gcloud",
       "firebase",
       "test",
       "android",
@@ -491,7 +495,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
+      "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/bin/gcloud",
       "firebase",
       "test",
       "android",
diff --git a/recipes/flutter/flutter_drone.expected/web_engine.json b/recipes/flutter/flutter_drone.expected/web_engine.json
index 48e336c..d2a889f 100644
--- a/recipes/flutter/flutter_drone.expected/web_engine.json
+++ b/recipes/flutter/flutter_drone.expected/web_engine.json
@@ -287,7 +287,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[START_DIR]/flutter",
     "env": {
@@ -322,7 +322,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -371,7 +371,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/flutter/flutter_drone.expected/web_engine_reduced.json b/recipes/flutter/flutter_drone.expected/web_engine_reduced.json
index d2afb41..320e492 100644
--- a/recipes/flutter/flutter_drone.expected/web_engine_reduced.json
+++ b/recipes/flutter/flutter_drone.expected/web_engine_reduced.json
@@ -287,7 +287,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision"
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee"
     ],
     "cwd": "[START_DIR]/flutter",
     "env": {
@@ -322,7 +322,7 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee",
       "-ensure-file",
       "infra/tools/luci/cas/${platform} git_revision:mock_infra_git_revision",
       "-max-threads",
@@ -371,7 +371,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/infra/tools/luci/cas/git_revision%3Amock_infra_git_revision/cas",
+      "[START_DIR]/cipd_tool/infra/tools/luci/cas/33f9d887e5b8aeaaf9d65506acccfa8da2c480712e534a23a79e92c342c44bee/cas",
       "download",
       "-cas-instance",
       "projects/example-cas-server/instances/default_instance",
diff --git a/recipes/infra/ci_yaml.expected/basic.json b/recipes/infra/ci_yaml.expected/basic.json
index 47db2d2..08f182a 100644
--- a/recipes/infra/ci_yaml.expected/basic.json
+++ b/recipes/infra/ci_yaml.expected/basic.json
@@ -1052,7 +1052,14 @@
   },
   {
     "cmd": [],
-    "name": "ensure gerrit"
+    "name": "ensure infra/tools/luci/gerrit/${platform}"
+  },
+  {
+    "cmd": [],
+    "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
@@ -1062,8 +1069,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[START_DIR]/infra",
     "infra_step": true,
@@ -1079,19 +1086,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gerrit.read manifest",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gerrit\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "ensure gerrit.install path/to/gerrit",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1106,7 +1110,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[START_DIR]/infra",
     "infra_step": true,
@@ -1122,7 +1126,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1132,9 +1136,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gerrit version:pinned-version",
+      "infra/tools/luci/gerrit/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1154,7 +1158,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1162,7 +1166,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gerrit\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1172,7 +1176,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-query",
       "-host",
       "https://flutter-review.googlesource.com",
@@ -1276,7 +1280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-detail",
       "-host",
       "https://flutter-review.googlesource.com",
diff --git a/recipes/infra/ci_yaml.expected/release.json b/recipes/infra/ci_yaml.expected/release.json
index 896ce09..571d518 100644
--- a/recipes/infra/ci_yaml.expected/release.json
+++ b/recipes/infra/ci_yaml.expected/release.json
@@ -1052,7 +1052,14 @@
   },
   {
     "cmd": [],
-    "name": "ensure gerrit"
+    "name": "ensure infra/tools/luci/gerrit/${platform}"
+  },
+  {
+    "cmd": [],
+    "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
@@ -1062,8 +1069,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[START_DIR]/infra",
     "infra_step": true,
@@ -1079,19 +1086,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gerrit.read manifest",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gerrit\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "ensure gerrit.install path/to/gerrit",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1106,7 +1110,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[START_DIR]/infra",
     "infra_step": true,
@@ -1122,7 +1126,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1132,9 +1136,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gerrit version:pinned-version",
+      "infra/tools/luci/gerrit/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1154,7 +1158,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1162,7 +1166,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gerrit\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1172,7 +1176,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-query",
       "-host",
       "https://flutter-review.googlesource.com",
@@ -1276,7 +1280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-detail",
       "-host",
       "https://flutter-review.googlesource.com",
diff --git a/recipes/infra/ci_yaml.expected/staging.json b/recipes/infra/ci_yaml.expected/staging.json
index ac899b6..94df7b1 100644
--- a/recipes/infra/ci_yaml.expected/staging.json
+++ b/recipes/infra/ci_yaml.expected/staging.json
@@ -1052,7 +1052,14 @@
   },
   {
     "cmd": [],
-    "name": "ensure gerrit"
+    "name": "ensure infra/tools/luci/gerrit/${platform}"
+  },
+  {
+    "cmd": [],
+    "name": "ensure infra/tools/luci/gerrit/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@1@@@"
+    ]
   },
   {
     "cmd": [
@@ -1062,8 +1069,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "cwd": "[START_DIR]/infra",
     "infra_step": true,
@@ -1079,19 +1086,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gerrit.read manifest",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gerrit\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@2@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "ensure gerrit.install path/to/gerrit",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
@@ -1106,7 +1110,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "cwd": "[START_DIR]/infra",
     "infra_step": true,
@@ -1122,7 +1126,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gerrit.install path/to/gerrit.ensure package directory",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -1132,9 +1136,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gerrit version:pinned-version",
+      "infra/tools/luci/gerrit/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -1154,7 +1158,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "ensure gerrit.install path/to/gerrit.ensure_installed",
+    "name": "ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -1162,7 +1166,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gerrit\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -1172,7 +1176,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-query",
       "-host",
       "https://flutter-review.googlesource.com",
@@ -1276,7 +1280,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-detail",
       "-host",
       "https://flutter-review.googlesource.com",
diff --git a/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_flutter.json b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_flutter.json
index 77c4b22..9802143 100644
--- a/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_invalidbeta_flutter.json b/recipes/packaging/packaging.expected/linux_invalidbeta_flutter.json
index 77c4b22..9802143 100644
--- a/recipes/packaging/packaging.expected/linux_invalidbeta_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_invalidbeta_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_flutter.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_flutter.json
index a6aa2d9..0db1957 100644
--- a/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_flutter.json b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_flutter.json
index a6aa2d9..0db1957 100644
--- a/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_invalidflutter-release-test_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_flutter.json b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_flutter.json
index 4547c36..c445ea3 100644
--- a/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_invalidmaster_flutter.json b/recipes/packaging/packaging.expected/linux_invalidmaster_flutter.json
index 4547c36..c445ea3 100644
--- a/recipes/packaging/packaging.expected/linux_invalidmaster_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_invalidmaster_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_invalidstable_experimental_flutter.json b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_flutter.json
index 3cc1606..7b0c603 100644
--- a/recipes/packaging/packaging.expected/linux_invalidstable_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_invalidstable_flutter.json b/recipes/packaging/packaging.expected/linux_invalidstable_flutter.json
index 3cc1606..7b0c603 100644
--- a/recipes/packaging/packaging.expected/linux_invalidstable_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_invalidstable_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_flutter.json
index b8954e3..083ca00 100644
--- a/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_beta_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_beta_flutter.json
index e459bd1..3133c6a 100644
--- a/recipes/packaging/packaging.expected/linux_refs_heads_beta_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_beta_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_flutter.json
index 9137d48..895a0ce 100644
--- a/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_flutter.json
index 43c2d0a..47b87cc 100644
--- a/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_flutter-release-test_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_flutter.json
index c136349..f9a32d4 100644
--- a/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_master_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_master_flutter.json
index bc50881..f56e4b6 100644
--- a/recipes/packaging/packaging.expected/linux_refs_heads_master_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_master_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_flutter.json
index 19a5aee..fae7279 100644
--- a/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/linux_refs_heads_stable_flutter.json b/recipes/packaging/packaging.expected/linux_refs_heads_stable_flutter.json
index 089566e..0559e28 100644
--- a/recipes/packaging/packaging.expected/linux_refs_heads_stable_flutter.json
+++ b/recipes/packaging/packaging.expected/linux_refs_heads_stable_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_flutter.json
index 77c4b22..9802143 100644
--- a/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_invalidbeta_flutter.json b/recipes/packaging/packaging.expected/mac_invalidbeta_flutter.json
index 77c4b22..9802143 100644
--- a/recipes/packaging/packaging.expected/mac_invalidbeta_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidbeta_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_flutter.json
index a6aa2d9..0db1957 100644
--- a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_flutter.json b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_flutter.json
index a6aa2d9..0db1957 100644
--- a/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidflutter-release-test_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_flutter.json
index 4547c36..c445ea3 100644
--- a/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_invalidmaster_flutter.json b/recipes/packaging/packaging.expected/mac_invalidmaster_flutter.json
index 4547c36..c445ea3 100644
--- a/recipes/packaging/packaging.expected/mac_invalidmaster_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidmaster_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_invalidstable_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_flutter.json
index 3cc1606..7b0c603 100644
--- a/recipes/packaging/packaging.expected/mac_invalidstable_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_invalidstable_flutter.json b/recipes/packaging/packaging.expected/mac_invalidstable_flutter.json
index 3cc1606..7b0c603 100644
--- a/recipes/packaging/packaging.expected/mac_invalidstable_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_invalidstable_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_flutter.json
index b8954e3..083ca00 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_beta_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_beta_flutter.json
index ae2cfc2..1f9682b 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_beta_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_beta_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_flutter.json
index 9137d48..895a0ce 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_flutter.json
index 45628f2..f100693 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_flutter-release-test_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_flutter.json
index c136349..f9a32d4 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_master_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_master_flutter.json
index 9fd7da6..aa9b356 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_master_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_master_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_flutter.json
index 19a5aee..fae7279 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/mac_refs_heads_stable_flutter.json b/recipes/packaging/packaging.expected/mac_refs_heads_stable_flutter.json
index 9b4f2fa..679b550 100644
--- a/recipes/packaging/packaging.expected/mac_refs_heads_stable_flutter.json
+++ b/recipes/packaging/packaging.expected/mac_refs_heads_stable_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]/reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_invalidbeta_experimental_flutter.json b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_flutter.json
index 09319b9..413e876 100644
--- a/recipes/packaging/packaging.expected/win_invalidbeta_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_invalidbeta_flutter.json b/recipes/packaging/packaging.expected/win_invalidbeta_flutter.json
index 09319b9..413e876 100644
--- a/recipes/packaging/packaging.expected/win_invalidbeta_flutter.json
+++ b/recipes/packaging/packaging.expected/win_invalidbeta_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_flutter.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_flutter.json
index fad28a6..0e5361f 100644
--- a/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_invalidflutter-release-test_flutter.json b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_flutter.json
index fad28a6..0e5361f 100644
--- a/recipes/packaging/packaging.expected/win_invalidflutter-release-test_flutter.json
+++ b/recipes/packaging/packaging.expected/win_invalidflutter-release-test_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_invalidmaster_experimental_flutter.json b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_flutter.json
index 085bba2..a90a905 100644
--- a/recipes/packaging/packaging.expected/win_invalidmaster_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_invalidmaster_flutter.json b/recipes/packaging/packaging.expected/win_invalidmaster_flutter.json
index 085bba2..a90a905 100644
--- a/recipes/packaging/packaging.expected/win_invalidmaster_flutter.json
+++ b/recipes/packaging/packaging.expected/win_invalidmaster_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_invalidstable_experimental_flutter.json b/recipes/packaging/packaging.expected/win_invalidstable_experimental_flutter.json
index 152728d..8778e29 100644
--- a/recipes/packaging/packaging.expected/win_invalidstable_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_invalidstable_flutter.json b/recipes/packaging/packaging.expected/win_invalidstable_flutter.json
index 152728d..8778e29 100644
--- a/recipes/packaging/packaging.expected/win_invalidstable_flutter.json
+++ b/recipes/packaging/packaging.expected/win_invalidstable_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_flutter.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_flutter.json
index 71782c5..5209a5f 100644
--- a/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_refs_heads_beta_flutter.json b/recipes/packaging/packaging.expected/win_refs_heads_beta_flutter.json
index 94bae5c..68adeec 100644
--- a/recipes/packaging/packaging.expected/win_refs_heads_beta_flutter.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_beta_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_flutter.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_flutter.json
index 42ce6ab..431058e 100644
--- a/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_flutter.json b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_flutter.json
index d369e80..a04a6ee 100644
--- a/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_flutter.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_flutter-release-test_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_flutter.json b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_flutter.json
index 9e177af..61e4cc9 100644
--- a/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_refs_heads_master_flutter.json b/recipes/packaging/packaging.expected/win_refs_heads_master_flutter.json
index a987fa9..ae2d238 100644
--- a/recipes/packaging/packaging.expected/win_refs_heads_master_flutter.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_master_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_flutter.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_flutter.json
index 45ae99c..b178eb3 100644
--- a/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_flutter.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_experimental_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/packaging/packaging.expected/win_refs_heads_stable_flutter.json b/recipes/packaging/packaging.expected/win_refs_heads_stable_flutter.json
index abffacc..c5c4586 100644
--- a/recipes/packaging/packaging.expected/win_refs_heads_stable_flutter.json
+++ b/recipes/packaging/packaging.expected/win_refs_heads_stable_flutter.json
@@ -6,7 +6,7 @@
       "-root",
       "[START_DIR]\\reporter",
       "-ensure-file",
-      "infra/tools/security/provenance_broker/${platform} git_revision:d3cf3b0144447a77fd79c84fe8500dfe993ef602",
+      "infra/tools/security/provenance_broker/${platform} git_revision:1976175bb06a6ae95a0fe1b08de38572fe447fe8",
       "-max-threads",
       "0",
       "-json-output",
@@ -30,7 +30,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:d3c\",@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:197\",@@@",
       "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/security/provenance_broker/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
diff --git a/recipes/recipes.expected/ci.json b/recipes/recipes.expected/ci.json
index c6ebb3b..1625f4e 100644
--- a/recipes/recipes.expected/ci.json
+++ b/recipes/recipes.expected/ci.json
@@ -5,12 +5,19 @@
   },
   {
     "cmd": [],
-    "name": "checkout.ensure gerrit",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -18,8 +25,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "infra_step": true,
     "luci_context": {
@@ -34,19 +41,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.ensure gerrit.read manifest",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gerrit\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "checkout.ensure gerrit.install path/to/gerrit",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -61,7 +65,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "infra_step": true,
     "luci_context": {
@@ -76,7 +80,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.ensure gerrit.install path/to/gerrit.ensure package directory",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -86,9 +90,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gerrit version:pinned-version",
+      "infra/tools/luci/gerrit/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -107,7 +111,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.ensure gerrit.install path/to/gerrit.ensure_installed",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -115,7 +119,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gerrit\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -125,7 +129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-detail",
       "-host",
       "https://flutter-review.googlesource.com",
@@ -1463,10 +1467,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1481,40 +1486,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogPAogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IDwKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgPgogICAgPgogICAgY29uZmlnX2dyb3VwczogPAogICAgICBnZXJyaXQ6IDwKICAgICAgICB1cmw6ICJodHRwczovL2ZsdXR0ZXItcmV2aWV3Lmdvb2dsZXNvdXJjZS5jb20iCiAgICAgICAgcHJvamVjdHM6IDwKICAgICAgICAgIG5hbWU6ICJwcm9qZWN0IgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgPgogICAgICA+CiAgICAgIHZlcmlmaWVyczogPAogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiA8CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZmx1dHRlci1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZmx1dHRlci10cnlqb2ItYWNjZXNzIgogICAgICAgID4KICAgICAgICB0cnlqb2I6IDwKICAgICAgICAgIGJ1aWxkZXJzOiA8CiAgICAgICAgICAgIG5hbWU6ICJmbHV0dGVyL3RyeS9mbHV0dGVyLWJheiIKICAgICAgICAgID4KICAgICAgICA+CiAgICAgID4KICAgID4KICAgIGNvbmZpZ19ncm91cHM6IDwKICAgICAgZ2Vycml0OiA8CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mbHV0dGVyLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiA8CiAgICAgICAgICBuYW1lOiAiZmx1dHRlci9mbHV0dGVyIgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgPgogICAgICA+CiAgICAgIHZlcmlmaWVyczogPAogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiA8CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZmx1dHRlci1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZmx1dHRlci10cnlqb2ItYWNjZXNzIgogICAgICAgID4KICAgICAgICB0cnlqb2I6IDwKICAgICAgICAgIGJ1aWxkZXJzOiA8CiAgICAgICAgICAgIG5hbWU6ICJmbHV0dGVyL3RyeS9mbHV0dGVyLWJhciIKICAgICAgICAgID4KICAgICAgICAgIGJ1aWxkZXJzOiA8CiAgICAgICAgICAgIG5hbWU6ICJmbHV0dGVyL3RyeS9mbHV0dGVyLWZvbyIKICAgICAgICAgID4KICAgICAgICA+CiAgICAgID4KICAgID4K\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index c6ebb3b..1625f4e 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -5,12 +5,19 @@
   },
   {
     "cmd": [],
-    "name": "checkout.ensure gerrit",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -18,8 +25,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "infra_step": true,
     "luci_context": {
@@ -34,19 +41,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.ensure gerrit.read manifest",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gerrit\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "checkout.ensure gerrit.install path/to/gerrit",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -61,7 +65,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "infra_step": true,
     "luci_context": {
@@ -76,7 +80,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.ensure gerrit.install path/to/gerrit.ensure package directory",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -86,9 +90,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gerrit version:pinned-version",
+      "infra/tools/luci/gerrit/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -107,7 +111,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "checkout.ensure gerrit.install path/to/gerrit.ensure_installed",
+    "name": "checkout.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -115,7 +119,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gerrit\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -125,7 +129,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-detail",
       "-host",
       "https://flutter-review.googlesource.com",
@@ -1463,10 +1467,11 @@
   },
   {
     "cmd": [
-      "luci-auth",
-      "token",
-      "-lifetime",
-      "3m"
+      "prpc",
+      "call",
+      "-format=json",
+      "config.luci.app",
+      "config.service.v2.Configs.GetConfig"
     ],
     "infra_step": true,
     "luci_context": {
@@ -1481,40 +1486,14 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "fetch flutter commit-queue.cfg.get access token for default account",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython3",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::url]/resources/pycurl.py",
-      "--url",
-      "https://luci-config.appspot.com/_ah/api/config/v1/config_sets/projects/flutter/config/commit-queue.cfg",
-      "--status-json",
-      "/path/to/tmp/json",
-      "--outfile",
-      "/path/to/tmp/json",
-      "--headers-json",
-      "{\"Authorization\": \"Bearer extra.secret.token.should.not.be.logged\"}"
-    ],
-    "luci_context": {
-      "realm": {
-        "name": "project:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
     "name": "fetch flutter commit-queue.cfg.get",
+    "stdin": "{\n  \"config_set\": \"projects/flutter\",\n  \"path\": \"commit-queue.cfg\"\n}",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
+      "@@@STEP_NEST_LEVEL@1@@@",
+      "@@@STEP_LOG_LINE@proto.output@{@@@",
+      "@@@STEP_LOG_LINE@proto.output@  \"raw_content\": \"CiAgICBzdWJtaXRfb3B0aW9uczogPAogICAgICBtYXhfYnVyc3Q6IDQKICAgICAgYnVyc3RfZGVsYXk6IDwKICAgICAgICBzZWNvbmRzOiA0ODAKICAgICAgPgogICAgPgogICAgY29uZmlnX2dyb3VwczogPAogICAgICBnZXJyaXQ6IDwKICAgICAgICB1cmw6ICJodHRwczovL2ZsdXR0ZXItcmV2aWV3Lmdvb2dsZXNvdXJjZS5jb20iCiAgICAgICAgcHJvamVjdHM6IDwKICAgICAgICAgIG5hbWU6ICJwcm9qZWN0IgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgPgogICAgICA+CiAgICAgIHZlcmlmaWVyczogPAogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiA8CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZmx1dHRlci1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZmx1dHRlci10cnlqb2ItYWNjZXNzIgogICAgICAgID4KICAgICAgICB0cnlqb2I6IDwKICAgICAgICAgIGJ1aWxkZXJzOiA8CiAgICAgICAgICAgIG5hbWU6ICJmbHV0dGVyL3RyeS9mbHV0dGVyLWJheiIKICAgICAgICAgID4KICAgICAgICA+CiAgICAgID4KICAgID4KICAgIGNvbmZpZ19ncm91cHM6IDwKICAgICAgZ2Vycml0OiA8CiAgICAgICAgdXJsOiAiaHR0cHM6Ly9mbHV0dGVyLXJldmlldy5nb29nbGVzb3VyY2UuY29tIgogICAgICAgIHByb2plY3RzOiA8CiAgICAgICAgICBuYW1lOiAiZmx1dHRlci9mbHV0dGVyIgogICAgICAgICAgcmVmX3JlZ2V4cDogInJlZnMvaGVhZHMvLisiCiAgICAgICAgPgogICAgICA+CiAgICAgIHZlcmlmaWVyczogPAogICAgICAgIGdlcnJpdF9jcV9hYmlsaXR5OiA8CiAgICAgICAgICBjb21taXR0ZXJfbGlzdDogInByb2plY3QtZmx1dHRlci1jb21taXR0ZXJzIgogICAgICAgICAgZHJ5X3J1bl9hY2Nlc3NfbGlzdDogInByb2plY3QtZmx1dHRlci10cnlqb2ItYWNjZXNzIgogICAgICAgID4KICAgICAgICB0cnlqb2I6IDwKICAgICAgICAgIGJ1aWxkZXJzOiA8CiAgICAgICAgICAgIG5hbWU6ICJmbHV0dGVyL3RyeS9mbHV0dGVyLWJhciIKICAgICAgICAgID4KICAgICAgICAgIGJ1aWxkZXJzOiA8CiAgICAgICAgICAgIG5hbWU6ICJmbHV0dGVyL3RyeS9mbHV0dGVyLWZvbyIKICAgICAgICAgID4KICAgICAgICA+CiAgICAgID4KICAgID4K\"@@@",
+      "@@@STEP_LOG_LINE@proto.output@}@@@",
+      "@@@STEP_LOG_END@proto.output@@@"
     ]
   },
   {
diff --git a/recipes/tricium/tricium.expected/basic.json b/recipes/tricium/tricium.expected/basic.json
index 6cbed37..049731d 100644
--- a/recipes/tricium/tricium.expected/basic.json
+++ b/recipes/tricium/tricium.expected/basic.json
@@ -668,12 +668,19 @@
   },
   {
     "cmd": [],
-    "name": "check commit tags.ensure gerrit",
+    "name": "check commit tags.ensure infra/tools/luci/gerrit/${platform}",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@1@@@"
     ]
   },
   {
+    "cmd": [],
+    "name": "check commit tags.ensure infra/tools/luci/gerrit/${platform}.get packages",
+    "~followup_annotations": [
+      "@@@STEP_NEST_LEVEL@2@@@"
+    ]
+  },
+  {
     "cmd": [
       "vpython3",
       "-u",
@@ -681,8 +688,8 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "RECIPE_MODULE[fuchsia::gerrit]/resources/tool_manifest.json",
-      "/path/to/tmp/json"
+      "RECIPE_MODULE[fuchsia::gerrit]/resources/cipd.ensure",
+      "/path/to/tmp/"
     ],
     "infra_step": true,
     "luci_context": {
@@ -697,19 +704,16 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "check commit tags.ensure gerrit.read manifest",
+    "name": "check commit tags.ensure infra/tools/luci/gerrit/${platform}.get packages.read ensure file",
     "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@{@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"path\": \"path/to/gerrit\",@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@  \"version\": \"version:pinned-version\"@@@",
-      "@@@STEP_LOG_LINE@tool_manifest.json@}@@@",
-      "@@@STEP_LOG_END@tool_manifest.json@@@"
+      "@@@STEP_NEST_LEVEL@3@@@",
+      "@@@STEP_LOG_LINE@cipd.ensure@infra/tools/luci/gerrit/${platform} version:pinned-version@@@",
+      "@@@STEP_LOG_END@cipd.ensure@@@"
     ]
   },
   {
     "cmd": [],
-    "name": "check commit tags.ensure gerrit.install path/to/gerrit",
+    "name": "check commit tags.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@2@@@"
     ]
@@ -724,7 +728,7 @@
       "ensure-directory",
       "--mode",
       "0777",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version"
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07"
     ],
     "infra_step": true,
     "luci_context": {
@@ -739,7 +743,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "check commit tags.ensure gerrit.install path/to/gerrit.ensure package directory",
+    "name": "check commit tags.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure package directory",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@"
     ]
@@ -749,9 +753,9 @@
       "cipd",
       "ensure",
       "-root",
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07",
       "-ensure-file",
-      "path/to/gerrit version:pinned-version",
+      "infra/tools/luci/gerrit/${platform} version:pinned-version",
       "-max-threads",
       "0",
       "-json-output",
@@ -770,7 +774,7 @@
         "hostname": "rdbhost"
       }
     },
-    "name": "check commit tags.ensure gerrit.install path/to/gerrit.ensure_installed",
+    "name": "check commit tags.ensure infra/tools/luci/gerrit/${platform}.install infra/tools/luci/gerrit.ensure_installed",
     "~followup_annotations": [
       "@@@STEP_NEST_LEVEL@3@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
@@ -778,7 +782,7 @@
       "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
       "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-version:pinned-v\",@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"path/to/gerrit\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
@@ -788,7 +792,7 @@
   },
   {
     "cmd": [
-      "[START_DIR]/cipd_tool/path/to/gerrit/version%3Apinned-version/gerrit",
+      "[START_DIR]/cipd_tool/infra/tools/luci/gerrit/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07/gerrit",
       "change-detail",
       "-host",
       "https://fuchsia-review.googlesource.com",
@@ -964,134 +968,9 @@
   },
   {
     "cmd": [],
-    "name": "analyze engine.py"
-  },
-  {
-    "cmd": [
-      "git",
-      "diff-tree",
-      "--no-commit-id",
-      "--diff-filter=d",
-      "-U0",
-      "HEAD",
-      "--",
-      "engine.py"
-    ],
-    "cwd": "[START_DIR]/recipes",
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "analyze engine.py.get change diff",
-    "timeout": 600.0,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@change_line_ranges@[Range(start=1, end=5)]@@@",
-      "@@@STEP_LOG_END@change_line_ranges@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "analyze engine.py.yapf",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/yapf",
-      "--in-place",
-      "engine.py"
-    ],
-    "cwd": "[START_DIR]/recipes",
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "analyze engine.py.yapf.run",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff-index",
-      "--no-commit-id",
-      "--diff-filter=d",
-      "-U0",
-      "HEAD",
-      "--",
-      "engine.py"
-    ],
-    "cwd": "[START_DIR]/recipes",
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "analyze engine.py.get formatted diff",
-    "timeout": 600.0,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@formatted_line_ranges@[Range(start=1, end=3)]@@@",
-      "@@@STEP_LOG_END@formatted_line_ranges@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "reset",
-      "--hard",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/recipes",
-    "luci_context": {
-      "realm": {
-        "name": "fuchsia:try"
-      },
-      "resultdb": {
-        "current_invocation": {
-          "name": "invocations/build:8945511751514863184",
-          "update_token": "token"
-        },
-        "hostname": "rdbhost"
-      }
-    },
-    "name": "analyze engine.py.reset",
-    "timeout": 600.0,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
     "name": "write results",
     "~followup_annotations": [
-      "@@@SET_BUILD_PROPERTY@tricium@\"{\\n\\\"comments\\\": [\\n{\\n\\\"category\\\": \\\"Format/YAPF\\\",\\n\\\"message\\\": \\\"File not formatted properly.\\\\nRun the following to format:\\\\n\\\\nyapf --in-place engine.py\\\",\\n\\\"path\\\": \\\"engine.py\\\"\\n}\\n]\\n}\"@@@"
+      "@@@SET_BUILD_PROPERTY@tricium@\"{}\"@@@"
     ]
   },
   {
diff --git a/recipes/tricium/tricium.py b/recipes/tricium/tricium.py
index e5a2df0..4ed64ce 100644
--- a/recipes/tricium/tricium.py
+++ b/recipes/tricium/tricium.py
@@ -36,7 +36,7 @@
     '_CheckoutResult', ['root_dir', 'release_version']
 )
 
-REMOTE='https://flutter.googlesource.com/recipes'
+REMOTE = 'https://flutter.googlesource.com/recipes'
 
 
 def RunSteps(api, props):
@@ -85,13 +85,13 @@
 
   def change_diff_data(filename):
     return api.step_data(
-        f"analyze {filename}.get change diff",
+        f"check for inclusivity.get change diff for {filename}",
         api.raw_io.stream_output_text(DIFF.format(filename)),
     )
 
   def formatted_diff_data(filename):
     return api.step_data(
-        f"analyze {filename}.get formatted diff",
+        f"check for inclusivity.get change diff for {filename}",
         api.raw_io.stream_output_text(DIFF.format(filename)),
     )