diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx
index ec8695dda3d4..788632b2281d 100755
--- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx
+++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx
@@ -5,9 +5,10 @@
 package.json=750671300
 packages/angular/cli/package.json=349838588
 packages/angular_devkit/architect/package.json=-1496633956
+packages/angular_devkit/architect_cli/package.json=1551210941
 packages/angular_devkit/core/package.json=339935828
 packages/angular_devkit/schematics/package.json=673943597
 packages/schematics/angular/package.json=251715148
-pnpm-lock.yaml=1860194410
-pnpm-workspace.yaml=1839001260
+pnpm-lock.yaml=-1842536727
+pnpm-workspace.yaml=-1051214858
 yarn.lock=1185228888
diff --git a/WORKSPACE b/WORKSPACE
index 47c8590927bc..56237e0c3f2a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -188,6 +188,7 @@ npm_translate_lock(
         "//:pnpm-workspace.yaml",
         "//packages/angular/cli:package.json",
         "//packages/angular_devkit/architect:package.json",
+        "//packages/angular_devkit/architect_cli:package.json",
         "//packages/angular_devkit/core:package.json",
         "//packages/angular_devkit/schematics:package.json",
         "//packages/schematics/angular:package.json",
diff --git a/npm_package_archive.tgz b/npm_package_archive.tgz
new file mode 100755
index 000000000000..0b5befe73c0e
Binary files /dev/null and b/npm_package_archive.tgz differ
diff --git a/packages/angular_devkit/architect_cli/BUILD.bazel b/packages/angular_devkit/architect_cli/BUILD.bazel
index 8a8350cdcb52..615248e9b795 100644
--- a/packages/angular_devkit/architect_cli/BUILD.bazel
+++ b/packages/angular_devkit/architect_cli/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults2.bzl", "npm_package", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
@@ -8,6 +9,8 @@ licenses(["notice"])
 
 package(default_visibility = ["//visibility:public"])
 
+npm_link_all_packages()
+
 ts_project(
     name = "architect_cli",
     srcs = [
@@ -15,14 +18,12 @@ ts_project(
     ] + glob(["src/**/*.ts"]),
     module_name = "@angular-devkit/architect-cli",
     deps = [
+        ":node_modules/@angular-devkit/architect",
+        ":node_modules/@angular-devkit/core",
         "//:node_modules/@types/node",
         "//:node_modules/@types/progress",
         "//:node_modules/@types/yargs-parser",
         "//:node_modules/ansi-colors",
-        "//packages/angular_devkit/architect:architect_rjs",
-        "//packages/angular_devkit/architect/node:node_rjs",
-        "//packages/angular_devkit/core:core_rjs",
-        "//packages/angular_devkit/core/node:node_rjs",
     ],
 )
 
diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json
index a468830ff5c0..c7ae69c92df6 100644
--- a/packages/angular_devkit/architect_cli/package.json
+++ b/packages/angular_devkit/architect_cli/package.json
@@ -14,8 +14,8 @@
     "tooling"
   ],
   "dependencies": {
-    "@angular-devkit/architect": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
-    "@angular-devkit/core": "0.0.0-PLACEHOLDER",
+    "@angular-devkit/architect": "workspace:0.0.0-EXPERIMENTAL-PLACEHOLDER",
+    "@angular-devkit/core": "workspace:0.0.0-PLACEHOLDER",
     "ansi-colors": "4.1.3",
     "progress": "2.0.3",
     "symbol-observable": "4.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3710074d4950..8c0968f3e199 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -589,6 +589,31 @@ importers:
         specifier: 7.8.1
         version: 7.8.1
 
+  packages/angular_devkit/architect_cli:
+    dependencies:
+      '@angular-devkit/architect':
+        specifier: workspace:0.0.0-EXPERIMENTAL-PLACEHOLDER
+        version: link:../architect
+      '@angular-devkit/core':
+        specifier: workspace:0.0.0-PLACEHOLDER
+        version: link:../core
+      ansi-colors:
+        specifier: 4.1.3
+        version: 4.1.3
+      progress:
+        specifier: 2.0.3
+        version: 2.0.3
+      symbol-observable:
+        specifier: 4.0.0
+        version: 4.0.0
+      yargs-parser:
+        specifier: 21.1.1
+        version: 21.1.1
+    devDependencies:
+      '@types/progress':
+        specifier: 2.0.7
+        version: 2.0.7
+
   packages/angular_devkit/core:
     dependencies:
       ajv:
@@ -6005,7 +6030,6 @@ packages:
   /ansi-colors@4.1.3:
     resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
     engines: {node: '>=6'}
-    dev: true
 
   /ansi-escapes@4.3.2:
     resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
@@ -12174,7 +12198,6 @@ packages:
   /progress@2.0.3:
     resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
     engines: {node: '>=0.4.0'}
-    dev: true
 
   /promise-inflight@1.0.1:
     resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 55262fe03045..e24f8d6d4f86 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,6 +1,7 @@
 packages:
   - .
   - packages/angular_devkit/architect
+  - packages/angular_devkit/architect_cli
   - packages/angular_devkit/core
   - packages/angular_devkit/schematics
   - packages/angular/cli