diff --git a/dev-infra/BUILD.bazel b/dev-infra/BUILD.bazel
index 16d1f66ff4..6c680be21a 100644
--- a/dev-infra/BUILD.bazel
+++ b/dev-infra/BUILD.bazel
@@ -37,10 +37,30 @@ genrule(
 
 pkg_npm(
     name = "npm_package",
+    srcs = [
+        "BUILD.bazel",
+        "//dev-infra/benchmark:files",
+    ],
+    substitutions = {
+        # angular/angular should not consume it's own packages, so we use
+        # substitutions to replace these in the deployed version of dev-infra.
+        "//dev-infra/": "@npm_dev_infra//",
+        "//packages/benchpress": "@npm//@angular/benchpress",
+        "//packages/bazel/src:esm5.bzl": "@npm_angular_bazel//src:esm5.bzl",
+        "//packages/zone.js/dist:zone.js": "@npm//:node_modules/zone.js/dist/zone.js",
+        "//packages/core": "@npm//@angular/core",
+        "//packages/platform-browser": "@npm//@angular/platform-browser",
+
+        # This substitution is particularly verbose because we need to make sure
+        # that only things available via Angular Bazel are imported from
+        # tools/defaults.bzl.
+        "load\(\"//tools:defaults.bzl\", \"ng_module\"\)": "load(\"@npm_angular_bazel//:index.bzl\", \"ng_module\")",
+    },
     visibility = ["//visibility:public"],
     deps = [
         ":cli",
         ":package-json",
+        "//dev-infra/benchmark/driver-utilities",
         "//dev-infra/commit-message",
         "//dev-infra/ts-circular-dependencies",
     ],
diff --git a/dev-infra/tmpl-package.json b/dev-infra/tmpl-package.json
index 250da626dd..a92f18d906 100644
--- a/dev-infra/tmpl-package.json
+++ b/dev-infra/tmpl-package.json
@@ -12,10 +12,12 @@
     "@octokit/graphql": "<from-root>",
     "chalk": "<from-root>",
     "cli-progress": "<from-root>",
+    "fs-extra": "<from-root>",
     "glob": "<from-root>",
     "inquirer": "<from-root>",
     "minimatch": "<from-root>",
     "multimatch": "<from-root>",
+    "node-uuid": "<from-root>",
     "semver": "<from-root>",
     "shelljs": "<from-root>",
     "typed-graphqlify": "<from-root>",
@@ -23,15 +25,39 @@
     "yargs": "<from-root>"
   },
   "peerDependencies": {
+    "@angular/bazel": "^9.0.0",
+    "@angular/core": "^9.0.0",
+    "@angular/platform-browser": "^9.0.0",
+    "@angular/benchpress": "^0.1.0",
+    "@angular-devkit/build-optimizer": "<from-root>",
     "@bazel/buildifier": "<from-root>",
+    "@bazel/protractor": "<from-root>",
+    "@bazel/terser": "<from-root>",
+    "@bazel/typescript": "<from-root>",
+    "brotli": "<from-root>",
     "clang-format": "<from-root>",
+    "cli-progress": "<from-root>",
+    "json5": "<from-root>",
+    "protractor": "<from-root>",
+    "rollup": "<from-root>",
+    "rollup-plugin-commonjs": "<from-root>",
+    "rollup-plugin-node-resolve": "<from-root>",
+    "rollup-plugin-sourcemaps": "<from-root>",
+    "selenium-webdriver": "<from-root>",
     "ts-node": "<from-root>",
     "tslib": "<from-root>",
-    "typescript": "<from-root>"
+    "typescript": "<from-root>",
+    "zone.js": "^0.10.3"
   },
   "peerDependenciesMeta": {
     "ts-node": {
       "optional": true
     }
+  },
+  "bazelWorkspaces": {
+    "npm_dev_infra": {
+      "version": "0.0.0-PLACEHOLDER",
+      "rootPath": "."
+    }
   }
 }
diff --git a/dev-infra/tools/BUILD.bazel b/dev-infra/tools/BUILD.bazel
deleted file mode 100644
index 9feb062ead..0000000000
--- a/dev-infra/tools/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-# Make source files available for distribution via pkg_npm
-filegroup(
-    name = "files",
-    srcs = glob(["*"]) + [
-        "//dev-infra/benchmark/brotli-cli:files",
-        "//dev-infra/benchmark/browsers:files",
-        "//dev-infra/benchmark/component_benchmark:files",
-        "//dev-infra/benchmark/ng_rollup_bundle:files",
-    ],
-)