diff --git a/.template/tsconfig.build.json b/.template/tsconfig.build.json
index 3c8d918..8cad7c5 100644
--- a/.template/tsconfig.build.json
+++ b/.template/tsconfig.build.json
@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist",
+    "rootDir": "./src",
     "declaration": true
   },
   "include": ["src/**/*"]
diff --git a/package-lock.json b/package-lock.json
index f6266df..8884344 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "lerna": "^9.0.0",
         "prettier": "^3.6.2",
         "tsx": "^4.20.3",
-        "typescript": "^5.8.3",
+        "typescript": "^6.0.0",
         "typescript-eslint": "^8.58.0"
       }
     },
@@ -12428,6 +12428,20 @@
         "node": ">=10"
       }
     },
+    "node_modules/lerna/node_modules/typescript": {
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=14.17"
+      }
+    },
     "node_modules/leven": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
@@ -17490,9 +17504,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz",
+      "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
diff --git a/package.json b/package.json
index dc2079d..4838049 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "lerna": "^9.0.0",
     "prettier": "^3.6.2",
     "tsx": "^4.20.3",
-    "typescript": "^5.8.3",
+    "typescript": "^6.0.0",
     "typescript-eslint": "^8.58.0"
   },
   "scripts": {
diff --git a/packages/2fa/tsconfig.build.json b/packages/2fa/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/2fa/tsconfig.build.json
+++ b/packages/2fa/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/answer-utils/tsconfig.build.json b/packages/answer-utils/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/answer-utils/tsconfig.build.json
+++ b/packages/answer-utils/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/async-utils/tsconfig.build.json b/packages/async-utils/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/async-utils/tsconfig.build.json
+++ b/packages/async-utils/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/crypto-utils/tsconfig.build.json b/packages/crypto-utils/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/crypto-utils/tsconfig.build.json
+++ b/packages/crypto-utils/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/database-utils/tsconfig.build.json b/packages/database-utils/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/database-utils/tsconfig.build.json
+++ b/packages/database-utils/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/examination-utils/__tests__/examination-period.test.ts b/packages/examination-utils/__tests__/examination-period.test.ts
index 8d771bd..955a088 100644
--- a/packages/examination-utils/__tests__/examination-period.test.ts
+++ b/packages/examination-utils/__tests__/examination-period.test.ts
@@ -6,14 +6,14 @@ describe('examination-period', () => {
     test('should expose period as constant', async context => {
       context.mock.timers.enable({ apis: ['Date'], now: new Date(2012, 0, 15) })
 
-      const { currentExaminationPeriod } = await import('../src/index')
+      const { currentExaminationPeriod } = await import('../src/index.js')
       assert.equal(currentExaminationPeriod, '2012K')
     })
 
     test('should return current period for spring', async context => {
       context.mock.timers.enable({ apis: ['Date'], now: new Date(2012, 0, 15) })
 
-      const { getCurrentExaminationPeriod } = await import('../src/examination-period')
+      const { getCurrentExaminationPeriod } = await import('../src/examination-period.js')
       const currentExaminationPeriod = getCurrentExaminationPeriod()
       assert.equal(currentExaminationPeriod, '2012K')
     })
@@ -21,7 +21,7 @@ describe('examination-period', () => {
     test('should return current period for fall', async context => {
       context.mock.timers.enable({ apis: ['Date'], now: new Date(2012, 7, 15) })
 
-      const { getCurrentExaminationPeriod } = await import('../src/examination-period')
+      const { getCurrentExaminationPeriod } = await import('../src/examination-period.js')
       const currentExaminationPeriod = getCurrentExaminationPeriod()
       assert.equal(currentExaminationPeriod, '2012S')
     })
diff --git a/packages/examination-utils/tsconfig.build.json b/packages/examination-utils/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/examination-utils/tsconfig.build.json
+++ b/packages/examination-utils/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/express-utils/tsconfig.build.json b/packages/express-utils/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/express-utils/tsconfig.build.json
+++ b/packages/express-utils/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/fetch/tsconfig.build.json b/packages/fetch/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/fetch/tsconfig.build.json
+++ b/packages/fetch/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/json-exam-utils/tsconfig.build.json b/packages/json-exam-utils/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/json-exam-utils/tsconfig.build.json
+++ b/packages/json-exam-utils/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/logger/tsconfig.build.json b/packages/logger/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/logger/tsconfig.build.json
+++ b/packages/logger/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/passphrase-generator/tsconfig.build.json b/packages/passphrase-generator/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/passphrase-generator/tsconfig.build.json
+++ b/packages/passphrase-generator/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/passport-saml-cache-postgres/tsconfig.build.json b/packages/passport-saml-cache-postgres/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/passport-saml-cache-postgres/tsconfig.build.json
+++ b/packages/passport-saml-cache-postgres/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/passport-utils/tsconfig.build.json b/packages/passport-utils/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/passport-utils/tsconfig.build.json
+++ b/packages/passport-utils/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/saml-mock/tsconfig.build.json b/packages/saml-mock/tsconfig.build.json
index 865dad4..ce547da 100644
--- a/packages/saml-mock/tsconfig.build.json
+++ b/packages/saml-mock/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "exclude": [
diff --git a/packages/testing/tsconfig.build.json b/packages/testing/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/testing/tsconfig.build.json
+++ b/packages/testing/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/typescript-config/common-tsconfig.json b/packages/typescript-config/common-tsconfig.json
index f8464e5..c8e1454 100644
--- a/packages/typescript-config/common-tsconfig.json
+++ b/packages/typescript-config/common-tsconfig.json
@@ -2,7 +2,6 @@
   "compilerOptions": {
     "allowJs": true,
     "esModuleInterop": true,
-    "moduleResolution": "node",
     "noUnusedLocals": true,
     "skipLibCheck": true,
     "sourceMap": true,
diff --git a/packages/typescript-config/public/tsconfig.json b/packages/typescript-config/public/tsconfig.json
index 41d80dd..db8629c 100644
--- a/packages/typescript-config/public/tsconfig.json
+++ b/packages/typescript-config/public/tsconfig.json
@@ -2,10 +2,11 @@
   "extends": "../common-tsconfig.json",
   "compilerOptions": {
     "jsx": "react",
-    "lib": ["es2022", "DOM", "DOM.Iterable"],
-    "module": "es2022",
+    "lib": ["es2024", "DOM", "DOM.Iterable"],
+    "module": "preserve",
+    "moduleResolution": "bundler",
     "noEmit": true,
-    "target": "es6",
+    "target": "es2020",
     "noErrorTruncation": true
   }
-}
\ No newline at end of file
+}
diff --git a/packages/typescript-config/root/tsconfig.json b/packages/typescript-config/root/tsconfig.json
index 0731c6d..74ada2c 100644
--- a/packages/typescript-config/root/tsconfig.json
+++ b/packages/typescript-config/root/tsconfig.json
@@ -1,10 +1,10 @@
 {
   "extends": "../common-tsconfig.json",
   "compilerOptions": {
-    "lib": ["es2022"],
-    "module": "commonjs",
+    "lib": ["es2024", "ESNext.Array", "ESNext.Collection", "ESNext.Error", "ESNext.Iterator", "ESNext.Promise"],
+    "module": "nodenext",
     "noEmit": false,
-    "resolveJsonModule": true,
-    "target": "es2022"
+    "target": "es2024",
+    "types": ["node"]
   }
 }
diff --git a/packages/validation/tsconfig.build.json b/packages/validation/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/validation/tsconfig.build.json
+++ b/packages/validation/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [
diff --git a/packages/zip-utils/tsconfig.build.json b/packages/zip-utils/tsconfig.build.json
index d96ead8..54eaadf 100644
--- a/packages/zip-utils/tsconfig.build.json
+++ b/packages/zip-utils/tsconfig.build.json
@@ -2,6 +2,7 @@
  "extends": "../../tsconfig.json",
  "compilerOptions": {
    "outDir": "./dist",
+   "rootDir": "./src",
    "declaration": true,
  },
  "include": [