diff --git a/src/dev/build/lib/config.ts b/src/dev/build/lib/config.ts
index a27592e3f6427..19fbd6ae8bd37 100644
--- a/src/dev/build/lib/config.ts
+++ b/src/dev/build/lib/config.ts
@@ -246,7 +246,7 @@ export class Config {
     return getPackages(this.repoRoot).filter(
       (p) =>
         (this.pluginSelector.testPlugins || !p.isDevOnly()) &&
-        (!p.isPlugin() || this.pluginFilter(p))
+        (!p.isPlugin() || (this.pluginFilter(p) && !p.isDevOnly()))
     );
   }
 
diff --git a/src/dev/build/tasks/build_packages_task.ts b/src/dev/build/tasks/build_packages_task.ts
index 1f6e150496921..5db703481b7df 100644
--- a/src/dev/build/tasks/build_packages_task.ts
+++ b/src/dev/build/tasks/build_packages_task.ts
@@ -255,7 +255,7 @@ export const BuildPackages: Task = {
               Path.resolve(pkgDistPath, 'package-map.json'),
               JSON.stringify(
                 packages
-                  .filter((p) => p.isPlugin() && !p.isDevOnly())
+                  .filter((p) => p.isPlugin())
                   .map((p) => [p.manifest.id, `node_modules/${p.manifest.id}`])
               )
             );