diff --git a/.changeset/stupid-monkeys-invent.md b/.changeset/stupid-monkeys-invent.md
new file mode 100644
index 00000000..e94d85bd
--- /dev/null
+++ b/.changeset/stupid-monkeys-invent.md
@@ -0,0 +1,6 @@
+---
+"livekit-server-sdk": patch
+"@livekit/rtc-node": patch
+---
+
+Fix types export for CJS and build config
diff --git a/packages/livekit-rtc/package.json b/packages/livekit-rtc/package.json
index 30a3a0f9..6018f8d5 100644
--- a/packages/livekit-rtc/package.json
+++ b/packages/livekit-rtc/package.json
@@ -9,9 +9,14 @@
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
     }
   },
   "type": "module",
diff --git a/packages/livekit-rtc/rust-sdks b/packages/livekit-rtc/rust-sdks
index 8cb20245..06997356 160000
--- a/packages/livekit-rtc/rust-sdks
+++ b/packages/livekit-rtc/rust-sdks
@@ -1 +1 @@
-Subproject commit 8cb20245841442a7a88766a372002f0eccbf0d58
+Subproject commit 06997356c083b01da766c4c93e8c4e8354d871ce
diff --git a/packages/livekit-server-sdk/package.json b/packages/livekit-server-sdk/package.json
index d691718e..4b5b20dc 100644
--- a/packages/livekit-server-sdk/package.json
+++ b/packages/livekit-server-sdk/package.json
@@ -14,9 +14,14 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
     }
   },
   "files": [
diff --git a/packages/livekit-server-sdk/src/AccessToken.test.ts b/packages/livekit-server-sdk/src/AccessToken.test.ts
index ba1e353f..c1f7036f 100644
--- a/packages/livekit-server-sdk/src/AccessToken.test.ts
+++ b/packages/livekit-server-sdk/src/AccessToken.test.ts
@@ -9,8 +9,8 @@ import {
 } from '@livekit/protocol';
 import * as jose from 'jose';
 import { describe, expect, it } from 'vitest';
-import { AccessToken, TokenVerifier } from './AccessToken';
-import type { ClaimGrants } from './grants';
+import { AccessToken, TokenVerifier } from './AccessToken.js';
+import type { ClaimGrants } from './grants.js';
 
 const testApiKey = 'abcdefg';
 const testSecret = 'abababa';
@@ -143,10 +143,10 @@ describe('room configuration with agents and egress', () => {
     expect(decoded.roomConfig?.name).toEqual('test-room');
     expect(decoded.roomConfig?.maxParticipants).toEqual(10);
     expect(decoded.roomConfig?.agents).toHaveLength(2);
-    expect(decoded.roomConfig?.agents?.[0].agentName).toEqual('agent1');
-    expect(decoded.roomConfig?.agents?.[0].metadata).toEqual('metadata-1');
-    expect(decoded.roomConfig?.agents?.[1].agentName).toEqual('agent2');
-    expect(decoded.roomConfig?.agents?.[1].metadata).toEqual('metadata-2');
+    expect(decoded.roomConfig?.agents?.[0]?.agentName).toEqual('agent1');
+    expect(decoded.roomConfig?.agents?.[0]?.metadata).toEqual('metadata-1');
+    expect(decoded.roomConfig?.agents?.[1]?.agentName).toEqual('agent2');
+    expect(decoded.roomConfig?.agents?.[1]?.metadata).toEqual('metadata-2');
     expect(decoded.roomConfig?.egress?.room?.roomName).toEqual('test-room');
   });
 });
diff --git a/packages/livekit-server-sdk/src/grants.test.ts b/packages/livekit-server-sdk/src/grants.test.ts
index 2e494b47..912d4cfd 100644
--- a/packages/livekit-server-sdk/src/grants.test.ts
+++ b/packages/livekit-server-sdk/src/grants.test.ts
@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 import { TrackSource } from '@livekit/protocol';
 import { describe, expect, it } from 'vitest';
-import type { ClaimGrants, VideoGrant } from './grants';
-import { claimsToJwtPayload } from './grants';
+import type { ClaimGrants, VideoGrant } from './grants.js';
+import { claimsToJwtPayload } from './grants.js';
 
 describe('ClaimGrants are parsed correctly', () => {
   it('parses TrackSource correctly to strings', () => {
diff --git a/tsup.config.ts b/tsup.config.ts
index d92f937f..d7b6b061 100644
--- a/tsup.config.ts
+++ b/tsup.config.ts
@@ -1,12 +1,11 @@
-import { Options } from 'tsup';
+import type { Options } from 'tsup';
 
 const defaultOptions: Options = {
-  entry: ['src/**/*.ts'],
+  entry: ['src/**/*.ts', '!src/**/*.test.ts'],
   format: ['cjs', 'esm'],
   splitting: false,
   sourcemap: true,
-  // for the type maps to work, we use tsc's declaration-only command
-  dts: false,
+  dts: true,
   clean: true,
   bundle: false,
   target: 'node16',