diff --git a/package.json b/package.json
index 151b1f39ff..e5028bfd2f 100644
--- a/package.json
+++ b/package.json
@@ -6,13 +6,13 @@
   },
   "scripts": {
     "start": "yarn workspace example-app start",
-    "bundle": "yarn build && yarn workspace example-app bundle",
+    "bundle": "yarn workspace example-app bundle",
     "build": "lerna run build",
     "tsc": "tsc",
     "clean": "backstage-cli clean && lerna run clean",
     "diff": "lerna run diff --",
-    "test": "yarn build && lerna run test --since origin/master -- --coverage",
-    "test:all": "yarn build && lerna run test -- --coverage",
+    "test": "lerna run test --since origin/master -- --coverage",
+    "test:all": "lerna run test -- --coverage",
     "lint": "lerna run lint --since origin/master --",
     "lint:all": "lerna run lint --",
     "docker-build": "yarn bundle && docker build . -t spotify/backstage",
diff --git a/packages/cli/templates/default-app/package.json.hbs b/packages/cli/templates/default-app/package.json.hbs
index 231194a54e..1712584a87 100644
--- a/packages/cli/templates/default-app/package.json.hbs
+++ b/packages/cli/templates/default-app/package.json.hbs
@@ -7,14 +7,17 @@
   },
   "scripts": {
     "start": "yarn workspace app start",
-    "bundle": "yarn build && yarn workspace app bundle",
+    "bundle": "yarn workspace app bundle",
     "build": "lerna run build",
-    "test": "yarn build && lerna run test --since origin/master -- --coverage",
-    "test:all": "yarn build && lerna run test -- --coverage",
+    "tsc": "tsc",
+    "clean": "backstage-cli clean && lerna run clean",
+    "diff": "lerna run diff --",
+    "test": "lerna run test --since origin/master -- --coverage",
+    "test:all": "lerna run test -- --coverage",
     "lint": "lerna run lint --since origin/master --",
     "lint:all": "lerna run lint --",
     "create-plugin": "backstage-cli create-plugin",
-    "clean": "lerna run clean"
+    "remove-plugin": "backstage-cli remove-plugin"
   },
   "workspaces": {
     "packages": [
diff --git a/packages/cli/templates/default-app/tsconfig.json b/packages/cli/templates/default-app/tsconfig.json
index f278b2777d..52cdd1e825 100644
--- a/packages/cli/templates/default-app/tsconfig.json
+++ b/packages/cli/templates/default-app/tsconfig.json
@@ -1,3 +1,8 @@
 {
-  "extends": "@backstage/cli/config/tsconfig.json"
+  "extends": "@backstage/cli/config/tsconfig.json",
+  "include": ["packages/*/src", "plugins/*/src", "plugins/*/dev"],
+  "exclude": ["**/node_modules"],
+  "compilerOptions": {
+    "outDir": "dist"
+  }
 }