diff --git a/package.json b/package.json
index e8427ec..d77204c 100644
--- a/package.json
+++ b/package.json
@@ -18,14 +18,14 @@
     "build:client": "tsc --build packages/client/tsconfig.json",
     "build:server": "tsc --build packages/server/tsconfig.json",
     "build:cjs": "tsc --build packages/common/tsconfig.cjs.json && node ./scripts/changeImports.mjs && tsc --build packages/server/tsconfig.cjs.json && node ./scripts/changeImports.mjs --reverse && node ./scripts/packageType.mjs",
-    "build": "npm run clear && npm run build:common && npm run build:client && npm run build:server && npm run build:cjs",
+    "build": "npm run clear && npm run build:common && npm run build:client && npm run build:server",
     "publish": "npm-run-all build publish:*",
     "publish:common": "cd packages/common/ && npm publish",
     "publish:server": "cd packages/server/ && npm publish",
     "publish:client": "cd packages/client/ && npm publish",
     "dev": "npm run build && cd packages/chatApp && npm run dev",
     "postinstall": "lerna bootstrap --no-ci && npm run build",
-    "test": "npm run build-client-bundle && npm run test:mjs && npm run test:cjs",
+    "test": "npm run build-client-bundle && npm run test:mjs",
     "test:mjs": "node --experimental-vm-modules node_modules/jest/bin/jest.js --coverage --forceExit --testMatch \"**/test/{common,e2e,server}/**/*test.?(c)js\"",
     "test:cjs": "jest --coverage --forceExit --testMatch \"**/test/cjs/**/*test.?(c)js\"",
     "clear": "rimraf packages/client/lib packages/common/lib packages/server/lib packages/common/cjs packages/server/cjs",
diff --git a/packages/server/package.json b/packages/server/package.json
index 33ac481..b363d49 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -45,7 +45,7 @@
   "dependencies": {
     "@geckos.io/common": "^3.0.0",
     "@yandeu/events": "0.0.6",
-    "node-datachannel": "0.7.0"
+    "node-datachannel": "0.8.0"
   },
   "funding": {
     "url": "https://github.com/sponsors/yandeu"
diff --git a/packages/server/src/wrtc/nodeDataChannel.ts b/packages/server/src/wrtc/nodeDataChannel.ts
index 3eb4117..945c857 100644
--- a/packages/server/src/wrtc/nodeDataChannel.ts
+++ b/packages/server/src/wrtc/nodeDataChannel.ts
@@ -1,6 +1,6 @@
 /* eslint-disable sort-imports */
-import ndc from 'node-datachannel'
-import type { DataChannel, DataChannelInitConfig, PeerConnection, RtcConfig } from 'node-datachannel'
+import { PeerConnection, cleanup as ndc_cleanup } from 'node-datachannel'
+import type { DataChannel, DataChannelInitConfig, RtcConfig } from 'node-datachannel'
 export type { DataChannel, DataChannelInitConfig, PeerConnection, RtcConfig }
 
 export const wait = (ms: number = 1000): Promise<void> => {
@@ -30,7 +30,7 @@ export const createDataChannel = (
 export const createPeerConnection = (peerName: string, config: RtcConfig): Promise<PeerConnection> => {
   return new Promise((resolve, reject) => {
     try {
-      const peerConnection = new ndc.PeerConnection(peerName, config)
+      const peerConnection = new PeerConnection(peerName, config)
       resolve(peerConnection)
     } catch (err) {
       reject(err)
@@ -63,7 +63,7 @@ export const closeDataChannel = (dataChannel: DataChannel): Promise<void> => {
 export const cleanup = (): Promise<void> => {
   return new Promise(resolve => {
     try {
-      ndc.cleanup()
+      ndc_cleanup()
       resolve()
     } catch (err) {
       resolve()
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 46f6b33..cefdc1c 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "target": "ES2019",
-    "module": "es2020",
-    "moduleResolution": "node",
+    "module": "Node16",
+    "moduleResolution": "Node16",
 
     "sourceMap": true,
     "declaration": true,