diff --git a/packages/angular_devkit/architect_cli/BUILD.bazel b/packages/angular_devkit/architect_cli/BUILD.bazel
index 2abecea4a525..636c07160582 100644
--- a/packages/angular_devkit/architect_cli/BUILD.bazel
+++ b/packages/angular_devkit/architect_cli/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "pkg_npm")
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults2.bzl", "npm_package", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
@@ -34,8 +33,8 @@ genrule(
     cmd = "cp $(execpath //:LICENSE) $@",
 )
 
-pkg_npm(
-    name = "npm_package",
+npm_package(
+    name = "pkg",
     pkg_deps = [
         "//packages/angular_devkit/architect:package.json",
         "//packages/angular_devkit/core:package.json",
@@ -43,7 +42,7 @@ pkg_npm(
     tags = ["release-package"],
     deps = [
         ":README.md",
-        ":architect_cli",
+        ":architect_cli_rjs",
         ":license",
     ],
 )
diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel
index e3a43d3ab6b9..38c2f723c3d0 100644
--- a/packages/angular_devkit/build_angular/BUILD.bazel
+++ b/packages/angular_devkit/build_angular/BUILD.bazel
@@ -5,8 +5,7 @@
 
 load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
-load("//tools:defaults.bzl", "pkg_npm")
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults2.bzl", "npm_package", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 licenses(["notice"])
@@ -78,6 +77,18 @@ ts_json_schema(
     src = "src/builders/web-test-runner/schema.json",
 )
 
+RUNTIME_ASSETS = glob(
+    include = [
+        "src/**/schema.json",
+        "src/**/*.js",
+        "src/**/*.mjs",
+        "src/**/*.html",
+    ],
+) + [
+    "builders.json",
+    "package.json",
+]
+
 ts_project(
     name = "build_angular",
     srcs = glob(
@@ -108,17 +119,7 @@ ts_project(
         "//packages/angular_devkit/build_angular:src/builders/ssr-dev-server/schema.ts",
         "//packages/angular_devkit/build_angular:src/builders/web-test-runner/schema.ts",
     ],
-    data = glob(
-        include = [
-            "src/**/schema.json",
-            "src/**/*.js",
-            "src/**/*.mjs",
-            "src/**/*.html",
-        ],
-    ) + [
-        "builders.json",
-        "package.json",
-    ],
+    data = RUNTIME_ASSETS,
     module_name = "@angular-devkit/build-angular",
     deps = [
         "//:root_modules/@ampproject/remapping",
@@ -239,8 +240,8 @@ genrule(
     cmd = "cp $(execpath //:LICENSE) $@",
 )
 
-pkg_npm(
-    name = "npm_package",
+npm_package(
+    name = "pkg",
     pkg_deps = [
         "//packages/angular/build:package.json",
         "//packages/angular_devkit/architect:package.json",
@@ -248,10 +249,13 @@ pkg_npm(
         "//packages/angular_devkit/core:package.json",
         "//packages/ngtools/webpack:package.json",
     ],
+    stamp_files = [
+        "src/utils/normalize-cache.js",
+    ],
     tags = ["release-package"],
-    deps = [
+    deps = RUNTIME_ASSETS + [
         ":README.md",
-        ":build_angular",
+        ":build_angular_rjs",
         ":license",
     ],
 )
diff --git a/packages/angular_devkit/build_webpack/BUILD.bazel b/packages/angular_devkit/build_webpack/BUILD.bazel
index 9d0c0df8e1ad..76867daf288c 100644
--- a/packages/angular_devkit/build_webpack/BUILD.bazel
+++ b/packages/angular_devkit/build_webpack/BUILD.bazel
@@ -5,8 +5,7 @@
 
 load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
-load("//tools:defaults.bzl", "pkg_npm")
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults2.bzl", "npm_package", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 licenses(["notice"])
@@ -23,6 +22,13 @@ ts_json_schema(
     src = "src/builders/webpack-dev-server/schema.json",
 )
 
+RUNTIME_ASSETS = [
+    "builders.json",
+    "package.json",
+    "src/builders/webpack-dev-server/schema.json",
+    "src/builders/webpack/schema.json",
+]
+
 ts_project(
     name = "build_webpack",
     srcs = glob(
@@ -36,12 +42,7 @@ ts_project(
         "//packages/angular_devkit/build_webpack:src/builders/webpack-dev-server/schema.ts",
         "//packages/angular_devkit/build_webpack:src/builders/webpack/schema.ts",
     ],
-    data = [
-        "builders.json",
-        "package.json",
-        "src/builders/webpack-dev-server/schema.json",
-        "src/builders/webpack/schema.json",
-    ],
+    data = RUNTIME_ASSETS,
     module_name = "@angular-devkit/build-webpack",
     deps = [
         "//:root_modules/@types/node",
@@ -99,16 +100,15 @@ genrule(
     cmd = "cp $(execpath //:LICENSE) $@",
 )
 
-pkg_npm(
-    name = "npm_package",
+npm_package(
+    name = "pkg",
     pkg_deps = [
         "//packages/angular_devkit/architect:package.json",
     ],
     tags = ["release-package"],
-    deps = [
+    deps = RUNTIME_ASSETS + [
         ":README.md",
-        ":build_webpack",
-        ":builders.json",
+        ":build_webpack_rjs",
         ":license",
     ],
 )
diff --git a/packages/angular_devkit/core/BUILD.bazel b/packages/angular_devkit/core/BUILD.bazel
index e577e15d589f..a27e72f14c5e 100644
--- a/packages/angular_devkit/core/BUILD.bazel
+++ b/packages/angular_devkit/core/BUILD.bazel
@@ -1,7 +1,6 @@
 load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
-load("//tools:defaults.bzl", "pkg_npm")
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults2.bzl", "npm_package", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
@@ -11,7 +10,14 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
-# @angular-devkit/core
+RUNTIME_ASSETS = glob(
+    include = ["**/*.json"],
+    # NB: we need to exclude the nested node_modules that is laid out by yarn workspaces
+    exclude = [
+        "node_modules/**",
+        "src/workspace/json/test/**",
+    ],
+)
 
 ts_project(
     name = "core",
@@ -21,14 +27,7 @@ ts_project(
             "src/**/*_spec.ts",
         ],
     ) + ["index.ts"],
-    data = glob(
-        include = ["**/*.json"],
-        # NB: we need to exclude the nested node_modules that is laid out by yarn workspaces
-        exclude = [
-            "node_modules/**",
-            "src/workspace/json/test/**",
-        ],
-    ),
+    data = RUNTIME_ASSETS,
     module_name = "@angular-devkit/core",
     deps = [
         "//:root_modules/@types/node",
@@ -73,15 +72,15 @@ genrule(
     cmd = "cp $(execpath //:LICENSE) $@",
 )
 
-pkg_npm(
-    name = "npm_package",
+npm_package(
+    name = "pkg",
     tags = ["release-package"],
-    deps = [
+    deps = RUNTIME_ASSETS + [
         ":README.md",
-        ":core",
+        ":core_rjs",
         ":license",
-        "//packages/angular_devkit/core/node",
-        "//packages/angular_devkit/core/node/testing",
+        "//packages/angular_devkit/core/node:node_rjs",
+        "//packages/angular_devkit/core/node/testing:testing_rjs",
     ],
 )
 
diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel
index 3c75cad4c266..2e69ab10ee39 100644
--- a/packages/angular_devkit/schematics/BUILD.bazel
+++ b/packages/angular_devkit/schematics/BUILD.bazel
@@ -1,7 +1,6 @@
 load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
-load("//tools:defaults.bzl", "pkg_npm")
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults2.bzl", "npm_package", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
@@ -61,8 +60,8 @@ genrule(
     cmd = "cp $(execpath //:LICENSE) $@",
 )
 
-pkg_npm(
-    name = "npm_package",
+npm_package(
+    name = "pkg",
     pkg_deps = [
         "//packages/angular_devkit/core:package.json",
     ],
@@ -71,11 +70,11 @@ pkg_npm(
         ":README.md",
         ":collection-schema.json",
         ":license",
-        ":schematics",
-        "//packages/angular_devkit/schematics/tasks",
+        ":schematics_rjs",
         "//packages/angular_devkit/schematics/tasks:package.json",
-        "//packages/angular_devkit/schematics/testing",
+        "//packages/angular_devkit/schematics/tasks:tasks_rjs",
         "//packages/angular_devkit/schematics/testing:package.json",
+        "//packages/angular_devkit/schematics/testing:testing_rjs",
         "//packages/angular_devkit/schematics/tools:package.json",
     ],
 )