diff --git a/packages/angular_devkit/architect_cli/BUILD.bazel b/packages/angular_devkit/architect_cli/BUILD.bazel
index 45261fd6b374..f5894c1c9ef9 100644
--- a/packages/angular_devkit/architect_cli/BUILD.bazel
+++ b/packages/angular_devkit/architect_cli/BUILD.bazel
@@ -1,4 +1,5 @@
-load("//tools:defaults.bzl", "pkg_npm", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm")
+load("//tools:interop.bzl", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
@@ -8,22 +9,23 @@ licenses(["notice"])
 
 package(default_visibility = ["//visibility:public"])
 
-ts_library(
+ts_project(
     name = "architect_cli",
-    package_name = "@angular-devkit/architect-cli",
     srcs = [
         "bin/architect.ts",
     ] + glob(["src/**/*.ts"]),
-    module_name = "@angular-devkit/architect-cli",
-    deps = [
-        "//packages/angular_devkit/architect",
-        "//packages/angular_devkit/architect/node",
+    interop_deps = [
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core/node",
-        "@npm//@types/node",
-        "@npm//@types/progress",
-        "@npm//@types/yargs-parser",
-        "@npm//ansi-colors",
+    ],
+    module_name = "@angular-devkit/architect-cli",
+    deps = [
+        "//:root_modules/@types/node",
+        "//:root_modules/@types/progress",
+        "//:root_modules/@types/yargs-parser",
+        "//:root_modules/ansi-colors",
+        "//packages/angular_devkit/architect:architect_rjs",
+        "//packages/angular_devkit/architect/node:node_rjs",
     ],
 )
 
diff --git a/tsconfig.json b/tsconfig.json
index 73c91f774209..c11293fd8e48 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -24,7 +24,7 @@
       ],
       "@angular-devkit/schematics/tools": ["./packages/angular_devkit/schematics/tools/index"],
       "@angular-devkit/schematics/testing": ["./packages/angular_devkit/schematics/testing/index"],
-      "@angular-devkit/architect/testing": ["./packages/angular_devkit/architect/testing/index"],
+      "@angular-devkit/architect/*": ["./packages/angular_devkit/architect/*/index"],
       "@angular-devkit/build-webpack": ["./packages/angular_devkit/build_webpack"],
       "@angular-devkit/*": ["./packages/angular_devkit/*/src"],
       "@angular/*": ["./packages/angular/*/src"],