diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel
index bd9de46a8e9..98baece26dd 100644
--- a/packages/service-worker/BUILD.bazel
+++ b/packages/service-worker/BUILD.bazel
@@ -1,5 +1,6 @@
 load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
-load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
+load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package")
+load("//tools:defaults2.bzl", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -12,7 +13,16 @@ rules_js_tsconfig(
     ],
 )
 
-ng_module(
+rules_js_tsconfig(
+    name = "tsconfig_test",
+    src = "tsconfig-test.json",
+    deps = [
+        "//:node_modules/@types/node",
+        "//packages:tsconfig_test",
+    ],
+)
+
+ng_project(
     name = "service-worker",
     srcs = glob(
         [
@@ -20,9 +30,11 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
-    deps = [
+    interop_deps = [
         "//packages/core",
-        "@npm//rxjs",
+    ],
+    deps = [
+        "//:node_modules/rxjs",
     ],
 )
 
diff --git a/packages/service-worker/cli/BUILD.bazel b/packages/service-worker/cli/BUILD.bazel
index c6f9069b8f2..29d4abd251b 100644
--- a/packages/service-worker/cli/BUILD.bazel
+++ b/packages/service-worker/cli/BUILD.bazel
@@ -8,10 +8,10 @@ ts_project(
     srcs = glob(
         ["**/*.ts"],
     ),
-    interop_deps = [
-        "//packages/service-worker/config",
-    ],
     tsconfig = "//packages/service-worker:tsconfig_build",
+    deps = [
+        "//packages/service-worker/config:config_rjs",
+    ],
 )
 
 esbuild_config(
diff --git a/packages/service-worker/config/BUILD.bazel b/packages/service-worker/config/BUILD.bazel
index 007f28865cb..9c419572f5c 100644
--- a/packages/service-worker/config/BUILD.bazel
+++ b/packages/service-worker/config/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
+load("//tools:defaults2.bzl", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -15,8 +15,8 @@ filegroup(
     ]),
 )
 
-ng_module(
+ng_project(
     name = "config",
     srcs = [":sources"],
-    deps = ["//packages/core"],
+    interop_deps = ["//packages/core"],
 )
diff --git a/packages/service-worker/config/test/BUILD.bazel b/packages/service-worker/config/test/BUILD.bazel
index 3c028c3a70e..74641191f65 100644
--- a/packages/service-worker/config/test/BUILD.bazel
+++ b/packages/service-worker/config/test/BUILD.bazel
@@ -7,10 +7,9 @@ ts_project(
     srcs = glob(
         ["**/*.ts"],
     ),
-    interop_deps = [
-        "//packages/service-worker/config",
-    ],
+    tsconfig = "//packages/service-worker:tsconfig_test",
     deps = [
+        "//packages/service-worker/config:config_rjs",
         "//packages/service-worker/config/testing:testing_rjs",
     ],
 )
diff --git a/packages/service-worker/config/testing/BUILD.bazel b/packages/service-worker/config/testing/BUILD.bazel
index 045b317fad3..1bf90e401b5 100644
--- a/packages/service-worker/config/testing/BUILD.bazel
+++ b/packages/service-worker/config/testing/BUILD.bazel
@@ -9,11 +9,9 @@ ts_project(
     srcs = glob([
         "*.ts",
     ]),
-    interop_deps = [
-        "//packages/service-worker/config",
-    ],
     tsconfig = "//packages/service-worker:tsconfig_build",
     deps = [
         "//packages/service-worker/cli:cli_rjs",
+        "//packages/service-worker/config:config_rjs",
     ],
 )
diff --git a/packages/service-worker/test/BUILD.bazel b/packages/service-worker/test/BUILD.bazel
index 2ad9f95933e..2087283b333 100644
--- a/packages/service-worker/test/BUILD.bazel
+++ b/packages/service-worker/test/BUILD.bazel
@@ -8,14 +8,15 @@ ts_project(
         "**/*.ts",
     ]),
     interop_deps = [
-        "//packages:types",
         "//packages/core",
         "//packages/core/testing",
         "//packages/service-worker",
         "//packages/service-worker/testing",
     ],
+    tsconfig = "//packages/service-worker:tsconfig_test",
     deps = [
         "//:node_modules/rxjs",
+        "//packages:types_rjs",
         "//packages/service-worker/worker:worker_rjs",
         "//packages/service-worker/worker/testing:testing_rjs",
     ],
diff --git a/packages/service-worker/testing/BUILD.bazel b/packages/service-worker/testing/BUILD.bazel
index 629685fc327..8ab91c05004 100644
--- a/packages/service-worker/testing/BUILD.bazel
+++ b/packages/service-worker/testing/BUILD.bazel
@@ -1,13 +1,16 @@
-load("//tools:defaults.bzl", "ng_module")
+load("//tools:defaults2.bzl", "ng_project")
 
 package(default_visibility = ["//visibility:public"])
 
-ng_module(
+ng_project(
     name = "testing",
     testonly = True,
     srcs = glob(["**/*.ts"]),
-    deps = [
+    interop_deps = [
         "//packages/core",
-        "@npm//rxjs",
+    ],
+    tsconfig = "//packages/service-worker:tsconfig_test",
+    deps = [
+        "//:node_modules/rxjs",
     ],
 )
diff --git a/packages/service-worker/tsconfig-test.json b/packages/service-worker/tsconfig-test.json
new file mode 100644
index 00000000000..d17572ea074
--- /dev/null
+++ b/packages/service-worker/tsconfig-test.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../tsconfig-test.json",
+  "compilerOptions": {
+    "types": ["node", "jasmine"]
+  }
+}
\ No newline at end of file
diff --git a/packages/service-worker/worker/test/BUILD.bazel b/packages/service-worker/worker/test/BUILD.bazel
index 34c6e5664b1..08834e5d009 100644
--- a/packages/service-worker/worker/test/BUILD.bazel
+++ b/packages/service-worker/worker/test/BUILD.bazel
@@ -7,11 +7,10 @@ ts_project(
     srcs = glob([
         "**/*.ts",
     ]),
-    interop_deps = [
-        "//packages:types",
-        "//packages/service-worker/config",
-    ],
+    tsconfig = "//packages/service-worker:tsconfig_test",
     deps = [
+        "//packages:types_rjs",
+        "//packages/service-worker/config:config_rjs",
         "//packages/service-worker/worker:worker_rjs",
         "//packages/service-worker/worker/testing:testing_rjs",
     ],
diff --git a/packages/service-worker/worker/testing/BUILD.bazel b/packages/service-worker/worker/testing/BUILD.bazel
index 33c00d2a8fc..890ae330152 100644
--- a/packages/service-worker/worker/testing/BUILD.bazel
+++ b/packages/service-worker/worker/testing/BUILD.bazel
@@ -7,12 +7,13 @@ ts_project(
     testonly = True,
     srcs = glob(["**/*.ts"]),
     interop_deps = [
-        "//packages:types",
         "//packages/core",
     ],
+    tsconfig = "//packages/service-worker:tsconfig_test",
     deps = [
         "//:node_modules/rxjs",
         "//:node_modules/typescript",
+        "//packages:types_rjs",
         "//packages/service-worker/worker:worker_rjs",
     ],
 )