diff --git a/frontend/package.json b/frontend/package.json
index 54aea2b77f..a60d0c8284 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "scripts": {
     "start": "yarn workspace @spotify-backstage/app start",
-    "build": "yarn workspace @spotify-backstage/app build",
+    "build": "lerna run build",
     "test": "cross-env CI=true lerna run test --stream --parallel -- --coverage",
     "create-plugin": "yarn workspace @spotify-backstage/cli build && backstage-cli create-plugin",
     "lint": "lerna run lint --stream"
diff --git a/frontend/packages/app/package.json b/frontend/packages/app/package.json
index fa180eca9d..f3451760de 100644
--- a/frontend/packages/app/package.json
+++ b/frontend/packages/app/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@spotify-backstage/cli": "^1.2.0",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@spotify-backstage/core": "1.0.0",
@@ -31,7 +32,7 @@
     ]
   },
   "scripts": {
-    "start": "cross-env EXTEND_ESLINT=true SKIP_PREFLIGHT_CHECK=true react-scripts start",
+    "start": "cross-env EXTEND_ESLINT=true SKIP_PREFLIGHT_CHECK=true backstage-cli watch-deps -- react-scripts start",
     "build": "cross-env EXTEND_ESLINT=true SKIP_PREFLIGHT_CHECK=true react-scripts build",
     "test": "cross-env EXTEND_ESLINT=true SKIP_PREFLIGHT_CHECK=true react-scripts test",
     "lint": "cross-env EXTEND_ESLINT=true eslint ./src/**/*.{ts,tsx} --max-warnings=0 --format=codeframe"
diff --git a/frontend/packages/core/package.json b/frontend/packages/core/package.json
index 4f89a47162..1be23df8da 100644
--- a/frontend/packages/core/package.json
+++ b/frontend/packages/core/package.json
@@ -3,14 +3,14 @@
   "version": "1.0.0",
   "license": "Apache-2.0",
   "private": false,
-  "main": "src/index.ts",
-  "main:src": "src/index.ts",
+  "main": "dist/cjs",
   "scripts": {
-    "build": "web-scripts build",
+    "build": "tsc --outDir dist/cjs --noEmit false --module CommonJS",
     "lint": "web-scripts lint",
     "test": "web-scripts test"
   },
   "dependencies": {
+    "@spotify-backstage/cli": "^1.2.0",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@types/google-protobuf": "^3.7.2",
diff --git a/frontend/packages/plugins/hello-world/package.json b/frontend/packages/plugins/hello-world/package.json
index 7fde174a22..a1d1222a6a 100644
--- a/frontend/packages/plugins/hello-world/package.json
+++ b/frontend/packages/plugins/hello-world/package.json
@@ -1,9 +1,9 @@
 {
   "name": "@spotify-backstage/plugin-hello-world",
   "version": "0.0.0",
-  "main": "src/index.ts",
-  "main:src": "src/index.ts",
+  "main": "dist/cjs",
   "devDependencies": {
+    "@spotify-backstage/cli": "^1.2.0",
     "@spotify-backstage/core": "1.0.0",
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
@@ -21,6 +21,7 @@
     "react-dom": "^16.12.0"
   },
   "scripts": {
+    "build": "tsc --outDir dist/cjs --noEmit false --module CommonJS",
     "lint": "web-scripts lint",
     "test": "web-scripts test"
   },
diff --git a/frontend/packages/plugins/home-page/package.json b/frontend/packages/plugins/home-page/package.json
index e59131c6e6..0d32c64015 100644
--- a/frontend/packages/plugins/home-page/package.json
+++ b/frontend/packages/plugins/home-page/package.json
@@ -1,9 +1,9 @@
 {
   "name": "@spotify-backstage/plugin-home-page",
   "version": "0.0.0",
-  "main": "src/index.ts",
-  "main:src": "src/index.ts",
+  "main": "dist/cjs",
   "devDependencies": {
+    "@spotify-backstage/cli": "^1.2.0",
     "@spotify-backstage/core": "1.0.0",
     "@spotify/web-scripts": "^6.0.0",
     "@testing-library/jest-dom": "^4.2.4",
@@ -19,6 +19,7 @@
     "@material-ui/icons": "^4.9.1"
   },
   "scripts": {
+    "build": "tsc --outDir dist/cjs --noEmit false --module CommonJS",
     "lint": "web-scripts lint",
     "test": "web-scripts test"
   },
diff --git a/frontend/packages/plugins/login/package.json b/frontend/packages/plugins/login/package.json
index f130bd6228..4237de820a 100644
--- a/frontend/packages/plugins/login/package.json
+++ b/frontend/packages/plugins/login/package.json
@@ -1,9 +1,9 @@
 {
   "name": "@spotify-backstage/plugin-login",
   "version": "0.0.0",
-  "main": "src/index.ts",
-  "main:src": "src/index.ts",
+  "main": "dist/cjs",
   "devDependencies": {
+    "@spotify-backstage/cli": "^1.2.0",
     "@spotify-backstage/core": "1.0.0",
     "@spotify/web-scripts": "^6.0.0",
     "@testing-library/jest-dom": "^4.2.4",
@@ -19,6 +19,7 @@
     "@material-ui/icons": "^4.9.1"
   },
   "scripts": {
+    "build": "tsc --outDir dist/cjs --noEmit false --module CommonJS",
     "lint": "web-scripts lint",
     "test": "web-scripts test"
   },