diff --git a/tsconfig.base.json b/tsconfig.base.json
index fb5368dc5a..4d3fb2b738 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -1,7 +1,7 @@
 {
   "extends": "@polkadot/dev/config/tsconfig.json",
 	"compilerOptions": {
-    "composite": false,
+    "composite": true,
 		"paths": {
       "@polkadot/apps": ["apps/src/index.tsx"],
       "@polkadot/apps/Root": ["apps/src/Root.tsx"],
diff --git a/tsconfig.build.json b/tsconfig.build.json
index 72592a84d7..463dc975dd 100644
--- a/tsconfig.build.json
+++ b/tsconfig.build.json
@@ -2,6 +2,7 @@
   "extends": "./tsconfig.base.json",
   "compilerOptions": {
     "baseUrl": "./packages",
+    "composite": true,
     "outDir": "./build",
     /*
      * We have a couple of issues that forces us to disable this -
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index 7fdc457a70..603d07ea6f 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -1,12 +1,12 @@
 {
   "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "./packages",
+    "composite": false
+  },
   "exclude": [
     "build/**/*",
     "**/build/**/*",
     "**/node_modules/**/*"
-  ],
-  "compilerOptions": {
-    "baseUrl": "./packages",
-    "composite": false
-  }
+  ]
 }