diff --git a/packages/cli/package.json b/packages/cli/package.json
index f1ca54ca1c..a430cc851c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -19,7 +19,7 @@
   "main": "dist",
   "scripts": {
     "exec": "npx ts-node ./src",
-    "build": "backstage-cli build-cache -- tsc --outDir dist --noEmit false --module CommonJS",
+    "build": "backstage-cli build-cache -- tsc",
     "lint": "backstage-cli lint",
     "test": "backstage-cli test",
     "start": "nodemon ."
diff --git a/packages/cli/src/commands/plugin/rollup.config.ts b/packages/cli/src/commands/plugin/rollup.config.ts
index fc4b5e92ef..ba2e95cb39 100644
--- a/packages/cli/src/commands/plugin/rollup.config.ts
+++ b/packages/cli/src/commands/plugin/rollup.config.ts
@@ -22,6 +22,7 @@ import postcss from 'rollup-plugin-postcss';
 import imageFiles from 'rollup-plugin-image-files';
 import json from '@rollup/plugin-json';
 import { RollupWatchOptions } from 'rollup';
+import { paths } from '../../helpers/paths';
 
 export default {
   input: 'src/index.ts',
@@ -30,7 +31,9 @@ export default {
     format: 'cjs',
   },
   plugins: [
-    peerDepsExternal(),
+    peerDepsExternal({
+      includeDependencies: true,
+    }),
     resolve({
       mainFields: ['browser', 'module', 'main'],
     }),
@@ -41,6 +44,9 @@ export default {
     postcss(),
     imageFiles(),
     json(),
-    typescript(),
+    typescript({
+      include: `${paths.resolveTarget('src')}/**/*.{js,jsx,ts,tsx}`,
+      exclude: [paths.resolveTarget('src/testUtils/**')],
+    }),
   ],
 } as RollupWatchOptions;
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 84b9319b94..e30150dda7 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -1,7 +1,9 @@
 {
-  "extends": "@spotify/web-scripts/config/tsconfig.json",
+  "extends": "../../tsconfig.json",
   "include": ["src"],
   "compilerOptions": {
+    "outDir": "dist",
+    "module": "CommonJS",
     "baseUrl": "src",
     "paths": {
       "*": ["src/*"]
diff --git a/packages/core/package.json b/packages/core/package.json
index 897d828b8e..93c2e2fdf7 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -16,11 +16,11 @@
     "backstage"
   ],
   "license": "Apache-2.0",
-  "main": "dist/cjs/index.js",
-  "types": "dist/cjs/index.d.ts",
+  "main": "dist/index.cjs.js",
+  "types": "dist/index.d.ts",
   "scripts": {
-    "build:watch": "tsc --outDir dist/cjs --noEmit false --module CommonJS --watch",
-    "build": "backstage-cli build-cache -- tsc --outDir dist/cjs --noEmit false --module CommonJS",
+    "build:watch": "backstage-cli plugin:build --watch",
+    "build": "backstage-cli build-cache -- backstage-cli plugin:build",
     "lint": "backstage-cli lint",
     "test": "backstage-cli test"
   },
diff --git a/packages/core/src/icons/icons.tsx b/packages/core/src/icons/icons.tsx
index a588a4a2a1..454a10c264 100644
--- a/packages/core/src/icons/icons.tsx
+++ b/packages/core/src/icons/icons.tsx
@@ -18,7 +18,7 @@ import { SvgIconProps } from '@material-ui/core';
 import PeopleIcon from '@material-ui/icons/People';
 import PersonIcon from '@material-ui/icons/Person';
 import React, { FC } from 'react';
-import { useApp } from '../api';
+import { useApp } from '../api/app/AppContext';
 import { IconComponent, SystemIconKey, SystemIcons } from './types';
 
 export const defaultSystemIcons: SystemIcons = {