diff --git a/app/game-api/package.json b/app/game-api/package.json
index 121ea7c..4b79472 100644
--- a/app/game-api/package.json
+++ b/app/game-api/package.json
@@ -2,6 +2,7 @@
     "name": "@sammo-ts/game-api",
     "private": true,
     "version": "0.0.0",
+    "type": "module",
     "scripts": {
         "build": "tsc -p tsconfig.json",
         "dev": "node -e \"console.log('dev not configured')\"",
diff --git a/app/game-engine/package.json b/app/game-engine/package.json
index 337a914..03c957f 100644
--- a/app/game-engine/package.json
+++ b/app/game-engine/package.json
@@ -2,6 +2,7 @@
     "name": "@sammo-ts/game-engine",
     "private": true,
     "version": "0.0.0",
+    "type": "module",
     "scripts": {
         "build": "tsc -p tsconfig.json",
         "dev": "node -e \"console.log('dev not configured')\"",
diff --git a/app/game-frontend/package.json b/app/game-frontend/package.json
index fcddaac..0535f50 100644
--- a/app/game-frontend/package.json
+++ b/app/game-frontend/package.json
@@ -2,6 +2,7 @@
     "name": "@sammo-ts/game-frontend",
     "private": true,
     "version": "0.0.0",
+    "type": "module",
     "scripts": {
         "build": "tsc -p tsconfig.json",
         "dev": "node -e \"console.log('dev not configured')\"",
diff --git a/app/gateway-api/package.json b/app/gateway-api/package.json
index bced06d..32c4d59 100644
--- a/app/gateway-api/package.json
+++ b/app/gateway-api/package.json
@@ -2,6 +2,7 @@
     "name": "@sammo-ts/gateway-api",
     "private": true,
     "version": "0.0.0",
+    "type": "module",
     "scripts": {
         "build": "tsc -p tsconfig.json",
         "dev": "node -e \"console.log('dev not configured')\"",
diff --git a/app/gateway-frontend/package.json b/app/gateway-frontend/package.json
index a6d0ca9..36fc6eb 100644
--- a/app/gateway-frontend/package.json
+++ b/app/gateway-frontend/package.json
@@ -2,6 +2,7 @@
     "name": "@sammo-ts/gateway-frontend",
     "private": true,
     "version": "0.0.0",
+    "type": "module",
     "scripts": {
         "build": "tsc -p tsconfig.json",
         "dev": "node -e \"console.log('dev not configured')\"",
diff --git a/packages/common/package.json b/packages/common/package.json
index 08da5df..16edb48 100644
--- a/packages/common/package.json
+++ b/packages/common/package.json
@@ -2,6 +2,7 @@
     "name": "@sammo-ts/common",
     "private": true,
     "version": "0.0.0",
+    "type": "module",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
     "scripts": {
diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
index 03ece44..a1afeae 100644
--- a/packages/common/src/index.ts
+++ b/packages/common/src/index.ts
@@ -1,2 +1,2 @@
-export * from './infra/postgres';
-export * from './infra/redis';
+export * from './infra/postgres.js';
+export * from './infra/redis.js';
diff --git a/tools/build-scripts/package.json b/tools/build-scripts/package.json
index eff4db4..0467db1 100644
--- a/tools/build-scripts/package.json
+++ b/tools/build-scripts/package.json
@@ -2,6 +2,7 @@
     "name": "@sammo-ts/build-scripts",
     "private": true,
     "version": "0.0.0",
+    "type": "module",
     "scripts": {
         "build": "tsc -p tsconfig.json",
         "dev": "node -e \"console.log('dev not configured')\"",
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 2e9c961..ac7e186 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -1,8 +1,8 @@
 {
     "compilerOptions": {
         "target": "ES2022",
-        "module": "CommonJS",
-        "moduleResolution": "Node",
+        "module": "NodeNext",
+        "moduleResolution": "NodeNext",
         "lib": ["ES2022"],
         "strict": true,
         "esModuleInterop": true,