diff --git a/client/tsconfig.app.json b/client/tsconfig.app.json
index 662c293..df67308 100644
--- a/client/tsconfig.app.json
+++ b/client/tsconfig.app.json
@@ -3,7 +3,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "./out-tsc/app",
+    "outDir": "../dist/out-tsc/client",
     "types": ["@angular/localize"]
   },
   "include": ["src/**/*.ts"],
diff --git a/client/tsconfig.json b/client/tsconfig.json
index ccb3156..b769d31 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -1,7 +1,7 @@
 /* To learn more about Typescript configuration file: https://www.typescriptlang.org/docs/handbook/tsconfig-json.html. */
 /* To learn more about Angular compiler options: https://angular.dev/reference/configs/angular-compiler-options. */
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../tsconfig.json",
   "compileOnSave": false,
   "compilerOptions": {
     "strict": true,
@@ -14,7 +14,6 @@
     "experimentalDecorators": true,
     "importHelpers": true,
     "target": "ES2022",
-    "module": "preserve"
   },
   "angularCompilerOptions": {
     "enableI18nLegacyMessageIdFormat": false,
diff --git a/client/tsconfig.spec.json b/client/tsconfig.spec.json
index ce3255e..e84b580 100644
--- a/client/tsconfig.spec.json
+++ b/client/tsconfig.spec.json
@@ -3,7 +3,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "./out-tsc/spec",
+    "outDir": "../dist/out-tsc/spec",
     "types": ["vitest/globals", "@angular/localize"]
   },
   "include": ["src/**/*.d.ts", "src/**/*.spec.ts"]
diff --git a/server/tsconfig.json b/server/tsconfig.json
index 032c330..8db55aa 100644
--- a/server/tsconfig.json
+++ b/server/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../dist/out-tsc/server",
-    "module": "commonjs",
     "esModuleInterop": true,
     "skipLibCheck": true,
     "allowSyntheticDefaultImports": true
diff --git a/tsconfig.json b/tsconfig.json
index 6b7fe2f..9462d83 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,11 +5,11 @@
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
-    "moduleResolution": "node",
+    "moduleResolution": "nodenext",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "target": "es2017",
-    "module": "es2020",
+    "module": "nodenext",
     "lib": ["es2020", "dom"]
   },
   "exclude": ["node_modules"]