diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.json
index 755e3d0..ff73331 100644
--- a/apps/server/tsconfig.json
+++ b/apps/server/tsconfig.json
@@ -1,7 +1,6 @@
 {
   "extends": "@furtherverse/tsconfig/react.json",
   "compilerOptions": {
-    "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]
     }
diff --git a/bun.lock b/bun.lock
index 3de538b..fbeae5c 100644
--- a/bun.lock
+++ b/bun.lock
@@ -7,7 +7,7 @@
       "devDependencies": {
         "@biomejs/biome": "^2.4.8",
         "turbo": "^2.8.20",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.0",
       },
     },
     "apps/desktop": {
@@ -1369,7 +1369,7 @@
 
     "type-fest": ["type-fest@5.5.0", "", { "dependencies": { "tagged-tag": "^1.0.0" } }, "sha512-PlBfpQwiUvGViBNX84Yxwjsdhd1TUlXr6zjX7eoirtCPIr08NAmxwa+fcYBTeRQxHo9YC9wwF3m9i700sHma8g=="],
 
-    "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="],
+    "typescript": ["typescript@6.0.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ=="],
 
     "ufo": ["ufo@1.6.3", "", {}, "sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q=="],
 
diff --git a/package.json b/package.json
index 99f8559..ddf2a38 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "devDependencies": {
     "@biomejs/biome": "^2.4.8",
     "turbo": "^2.8.20",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.0"
   },
   "catalog": {
     "@orpc/client": "^1.13.9",
diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.json
index c1495a0..51b3f81 100644
--- a/packages/tsconfig/base.json
+++ b/packages/tsconfig/base.json
@@ -20,7 +20,9 @@
     "noFallthroughCasesInSwitch": true,
     "noUncheckedSideEffectImports": true,
     "noUncheckedIndexedAccess": true,
-    "noImplicitOverride": true
+    "noImplicitOverride": true,
+
+    "types": ["bun"]
   },
   "exclude": ["node_modules"]
 }