diff --git a/packages/upgrade/BUILD.bazel b/packages/upgrade/BUILD.bazel
index 92f3ddd17f..f6f7a75583 100644
--- a/packages/upgrade/BUILD.bazel
+++ b/packages/upgrade/BUILD.bazel
@@ -7,7 +7,8 @@ ng_module(
     srcs = glob(
         [
             "*.ts",
-            "src/**/*.ts",
+            "src/common/**/*.ts",
+            "src/dynamic/**/*.ts",
         ],
     ),
     module_name = "@angular/upgrade",
diff --git a/packages/upgrade/static/BUILD.bazel b/packages/upgrade/static/BUILD.bazel
index 328c9bd724..62ce0857d0 100644
--- a/packages/upgrade/static/BUILD.bazel
+++ b/packages/upgrade/static/BUILD.bazel
@@ -6,9 +6,15 @@ load("//tools:defaults.bzl", "ng_module")
 
 ng_module(
     name = "static",
-    # Workaround for Bazel issue where Windows symlinks
-    # aka. junctions are not traversed by glob
-    srcs = glob(["*.ts"]) + glob(["src/**/*.ts"]),
+    # Note: There is Bazel issue where Windows symlinks
+    #       aka. junctions are not traversed by glob.
+    srcs = glob(
+        [
+            "*.ts",
+            "src/common/**/*.ts",
+            "src/static/**/*.ts",
+        ],
+    ),
     module_name = "@angular/upgrade/static",
     deps = [
         "//packages/core",