diff --git a/packages/cli/config/tsconfig.json b/packages/cli/config/tsconfig.json
new file mode 100644
index 0000000000..abb10087ca
--- /dev/null
+++ b/packages/cli/config/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "@spotify/web-scripts/config/tsconfig.json",
+  "exclude": ["**/*.test.*"],
+  "compilerOptions": {
+    "allowJs": true,
+    "noEmit": false,
+    "declarationMap": true,
+    "incremental": true,
+    "module": "es6"
+  }
+}
diff --git a/packages/cli/templates/default-app/tsconfig.json b/packages/cli/templates/default-app/tsconfig.json
index 25f61cc933..f278b2777d 100644
--- a/packages/cli/templates/default-app/tsconfig.json
+++ b/packages/cli/templates/default-app/tsconfig.json
@@ -1,10 +1,3 @@
 {
-  "extends": "@spotify/web-scripts/config/tsconfig.json",
-  "exclude": ["**/*.test.*"],
-  "compilerOptions": {
-    "allowJs": true,
-    "noEmit": false,
-    "declarationMap": true,
-    "incremental": true
-  }
+  "extends": "@backstage/cli/config/tsconfig.json"
 }
diff --git a/tsconfig.json b/tsconfig.json
index abb10087ca..f278b2777d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,11 +1,3 @@
 {
-  "extends": "@spotify/web-scripts/config/tsconfig.json",
-  "exclude": ["**/*.test.*"],
-  "compilerOptions": {
-    "allowJs": true,
-    "noEmit": false,
-    "declarationMap": true,
-    "incremental": true,
-    "module": "es6"
-  }
+  "extends": "@backstage/cli/config/tsconfig.json"
 }