diff --git a/packages/cc/tsconfig.json b/packages/cc/tsconfig.json
index 1bfc1b22ebf0..44e8e8bf5e8d 100644
--- a/packages/cc/tsconfig.json
+++ b/packages/cc/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {
 		"plugins": [
 			{
diff --git a/packages/config/tsconfig.json b/packages/config/tsconfig.json
index c4bda16326aa..8ae8d366ce1b 100644
--- a/packages/config/tsconfig.json
+++ b/packages/config/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {},
 	"references": [
 		{
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
index 29a3d110c136..87a067b0d8fd 100644
--- a/packages/core/tsconfig.json
+++ b/packages/core/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {},
 	"references": [
 		{
diff --git a/packages/eslint-plugin/tsconfig.json b/packages/eslint-plugin/tsconfig.json
index e44e49b3e13f..009cf5cd263f 100644
--- a/packages/eslint-plugin/tsconfig.json
+++ b/packages/eslint-plugin/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {
 		"types": ["node", "@typescript-eslint/utils"]
 	},
diff --git a/packages/flash/tsconfig.json b/packages/flash/tsconfig.json
index 741fc06e2f18..faa154a196e1 100644
--- a/packages/flash/tsconfig.json
+++ b/packages/flash/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {},
 	"references": [
 		{
diff --git a/packages/host/tsconfig.json b/packages/host/tsconfig.json
index 4142d64a0290..cac086a9dfce 100644
--- a/packages/host/tsconfig.json
+++ b/packages/host/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {},
 	"references": [
 		{
diff --git a/packages/maintenance/tsconfig.json b/packages/maintenance/tsconfig.json
index 9b48e626d4e4..433a40a06c77 100644
--- a/packages/maintenance/tsconfig.json
+++ b/packages/maintenance/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {
 		"newLine": "lf",
 		"resolveJsonModule": true
diff --git a/packages/nvmedit/tsconfig.json b/packages/nvmedit/tsconfig.json
index 84c565412a8b..0dedb919abdb 100644
--- a/packages/nvmedit/tsconfig.json
+++ b/packages/nvmedit/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {},
 	"references": [
 		{
diff --git a/packages/serial/tsconfig.json b/packages/serial/tsconfig.json
index 115504f6da7a..8eea8d2f0953 100644
--- a/packages/serial/tsconfig.json
+++ b/packages/serial/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {},
 	"references": [
 		{
diff --git a/packages/shared/tsconfig.json b/packages/shared/tsconfig.json
index 6741f46edd6d..e769ef20ecc0 100644
--- a/packages/shared/tsconfig.json
+++ b/packages/shared/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {},
 	"references": [],
 	"include": ["src/**/*.ts"],
diff --git a/packages/testing/tsconfig.json b/packages/testing/tsconfig.json
index a1fa88db0d08..85436b49c432 100644
--- a/packages/testing/tsconfig.json
+++ b/packages/testing/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {},
 	"references": [
 		{
diff --git a/packages/transformers/tsconfig.json b/packages/transformers/tsconfig.json
index a785100a72bf..2b018d70c5c2 100644
--- a/packages/transformers/tsconfig.json
+++ b/packages/transformers/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {
 		"newLine": "lf",
 		"experimentalDecorators": true,
diff --git a/packages/zwave-js/tsconfig.json b/packages/zwave-js/tsconfig.json
index c8079c792f22..55517958c793 100644
--- a/packages/zwave-js/tsconfig.json
+++ b/packages/zwave-js/tsconfig.json
@@ -1,6 +1,6 @@
 // tsconfig for IntelliSense - active in all files in the current package
 {
-	"extends": "../../tsconfig.base.json",
+	"extends": "../../tsconfig.json",
 	"compilerOptions": {
 		"plugins": [
 			{
diff --git a/tsconfig.base.json b/tsconfig.base.json
deleted file mode 100644
index 10e85b405bb8..000000000000
--- a/tsconfig.base.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"extends": "@tsconfig/node18/tsconfig.json",
-	"compilerOptions": {
-		"composite": true,
-		"incremental": true,
-		"declaration": true,
-		"declarationMap": true,
-
-		"noEmitOnError": true,
-		"removeComments": false,
-		"experimentalDecorators": true,
-		"emitDecoratorMetadata": false,
-		"sourceMap": true,
-		"inlineSourceMap": false,
-		"stripInternal": true,
-
-		"pretty": true,
-		"types": ["node"],
-		"noErrorTruncation": true
-	}
-	// "include": [
-	// 	"maintenance/**/*.ts",
-	// 	"test/**/*.ts"
-	// ],
-	// "exclude": ["**/build/**", "node_modules/**", "./packages/**/node_modules"]
-}
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index 1b98a4d3622c..343ab38b178b 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -1,5 +1,5 @@
 {
-	"extends": "./tsconfig.base.json",
+	"extends": "./tsconfig.json",
 	"include": ["**/*.ts"],
 	"exclude": ["**/build/**", "**/node_modules/**"]
 }
diff --git a/tsconfig.json b/tsconfig.json
index 765e49d2a0f2..e031d7fc7be9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,45 +1,28 @@
 {
-	"files": [],
-	"include": [],
-	"references": [
-		{
-			"path": "./packages/cc"
-		},
-		{
-			"path": "./packages/config"
-		},
-		{
-			"path": "./packages/core"
-		},
-		{
-			"path": "./packages/eslint-plugin"
-		},
-		{
-			"path": "./packages/flash"
-		},
-		{
-			"path": "./packages/host"
-		},
-		{
-			"path": "./packages/maintenance"
-		},
-		{
-			"path": "./packages/nvmedit"
-		},
-		{
-			"path": "./packages/serial"
-		},
-		{
-			"path": "./packages/shared"
-		},
-		{
-			"path": "./packages/testing"
-		},
-		{
-			"path": "./packages/transformers"
-		},
-		{
-			"path": "./packages/zwave-js"
-		}
-	]
+	"extends": "@tsconfig/node18/tsconfig.json",
+	"compilerOptions": {
+		"composite": true,
+		"incremental": true,
+		"declaration": true,
+		"declarationMap": true,
+
+		"noEmitOnError": true,
+		"removeComments": false,
+		"experimentalDecorators": true,
+		"emitDecoratorMetadata": false,
+		"sourceMap": true,
+		"inlineSourceMap": false,
+		"stripInternal": true,
+
+		"pretty": true,
+		"types": ["node"],
+		"noErrorTruncation": true
+	},
+	"include": [
+		"packages/**/src/**/*.ts",
+		"packages/**/maintenance/**/*.ts",
+		"maintenance/**/*.ts",
+		"test/**/*.ts"
+	],
+	"exclude": ["**/build/**", "node_modules/**", "packages/**/node_modules"]
 }
diff --git a/turbo.json b/turbo.json
index 19ed57a9ade7..7329cc2ba7af 100644
--- a/turbo.json
+++ b/turbo.json
@@ -91,7 +91,6 @@
 		"yarn.lock",
 		// Build fresh when TS related stuff changes
 		"tsconfig.json",
-		"tsconfig.base.json",
 		"tsconfig.build.json"
 	]
 }