diff --git a/apps/strapi-cms/src/admin/tsconfig.json b/apps/strapi-cms/src/admin/tsconfig.json
index cc4f5fb4e7..5582ca5215 100644
--- a/apps/strapi-cms/src/admin/tsconfig.json
+++ b/apps/strapi-cms/src/admin/tsconfig.json
@@ -1,8 +1,17 @@
 {
   "extends": [
-    "@strapi/typescript-utils/tsconfigs/admin",
-    "../../../../tsconfig.json"
+    "@strapi/typescript-utils/tsconfigs/admin"
   ],
+  "compilerOptions": {
+    "target": "es2021",
+    "module": "commonjs",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
+    "declaration": true
+  },
   "include": [
     "../plugins/**/admin/src/**/*",
     "./"
diff --git a/apps/strapi-cms/tsconfig.json b/apps/strapi-cms/tsconfig.json
index cb342eadf7..4dba70dd14 100644
--- a/apps/strapi-cms/tsconfig.json
+++ b/apps/strapi-cms/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": [
     "@strapi/typescript-utils/tsconfigs/server",
-    "../../tsconfig.json"
   ],
   "compilerOptions": {
     // with declaration to true strapi raises a runtime error
@@ -10,7 +9,14 @@
     // at /node_modules/@strapi/plugin-users-permissions/server/services/users-permissions.js:115:39
     "declaration": false,
     "outDir": "dist",
-    "rootDir": "."
+    "rootDir": ".",
+    "target": "es2021",
+    "module": "commonjs",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
+    "strict": true,
+    "skipLibCheck": true,
+    "sourceMap": true,
   },
   "include": [
     "./",