diff --git a/packages/cli-tools/tsconfig.node.json b/packages/cli-tools/tsconfig.node.json
index 0961dc9550..6ab612d34f 100644
--- a/packages/cli-tools/tsconfig.node.json
+++ b/packages/cli-tools/tsconfig.node.json
@@ -11,6 +11,6 @@
   ],
   "references": [
     { "path": "../utils/tsconfig.node.json" },
-    { "path": "../sdk/tsconfig.node.json" }
+    { "path": "../sdk" }
   ]
 }
diff --git a/packages/node/tsconfig.jest.json b/packages/node/tsconfig.jest.json
index f375e48d6c..8c9d063a9d 100644
--- a/packages/node/tsconfig.jest.json
+++ b/packages/node/tsconfig.jest.json
@@ -10,6 +10,6 @@
   "references": [
     { "path": "../utils/tsconfig.node.json" },
     { "path": "../test-utils/tsconfig.node.json" },
-    { "path": "../sdk/tsconfig.node.json" }
+    { "path": "../sdk" }
   ]
 }
diff --git a/packages/node/tsconfig.node.json b/packages/node/tsconfig.node.json
index 2cab25941e..8f36558499 100644
--- a/packages/node/tsconfig.node.json
+++ b/packages/node/tsconfig.node.json
@@ -12,6 +12,6 @@
   "references": [
     { "path": "../utils/tsconfig.node.json" },
     { "path": "../test-utils/tsconfig.node.json" },
-    { "path": "../sdk/tsconfig.node.json" }
+    { "path": "../sdk" }
   ]
 }
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index f597a916d2..ff95d302e6 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -32,7 +32,7 @@
   "scripts": {
     "prebuild": "node bin/generate-config-validator.js && ./proto.sh",
     "postbuild": "./scripts/postbuild.sh && bash fix-esm.sh",
-    "build": "tsc --build ./tsconfig.node.json",
+    "build": "tsc -b",
     "build-browser": "npm run build-browser-development && npm run build-browser-production",
     "build-browser-development": "NODE_ENV=development webpack --mode=development --progress",
     "build-browser-production": "NODE_ENV=production webpack --mode=production --progress",
diff --git a/packages/sdk/src/encryption/RSAKeyPair.ts b/packages/sdk/src/encryption/RSAKeyPair.ts
index 6c62fcd2dc..705d9ec5d2 100644
--- a/packages/sdk/src/encryption/RSAKeyPair.ts
+++ b/packages/sdk/src/encryption/RSAKeyPair.ts
@@ -1,3 +1,10 @@
+/**
+ * @todo This file contains code for both browser and Node.js environments. Consider
+ * making it environment-specific (using separate files or conditional exports), and
+ * remove the following "dom" lib reference when done.
+ */
+/// <reference lib="dom" />
+
 import crypto from 'crypto'
 import { promisify } from 'util'
 import { KeyExchangeKeyPair } from './KeyExchangeKeyPair'
diff --git a/packages/sdk/src/identity/ECDSAKeyPairIdentity.ts b/packages/sdk/src/identity/ECDSAKeyPairIdentity.ts
index 312122f28f..74d11041ea 100644
--- a/packages/sdk/src/identity/ECDSAKeyPairIdentity.ts
+++ b/packages/sdk/src/identity/ECDSAKeyPairIdentity.ts
@@ -2,6 +2,7 @@ import { hexToBinary, EcdsaSecp256r1 } from '@streamr/utils'
 import { KeyPairIdentity } from './KeyPairIdentity'
 import { SignatureType } from '@streamr/trackerless-network'
 import { StrictStreamrClientConfig } from '../Config'
+import type { webcrypto } from 'crypto'
 
 const signingUtil = new EcdsaSecp256r1()
 
@@ -10,7 +11,7 @@ const signingUtil = new EcdsaSecp256r1()
  */
 export class ECDSAKeyPairIdentity extends KeyPairIdentity {
 
-    private cachedJWK: JsonWebKey | undefined
+    private cachedJWK: webcrypto.JsonWebKey | undefined
 
     assertValidKeyPair(): void {
         signingUtil.assertValidKeyPair(this.publicKey, this.privateKey)
diff --git a/packages/sdk/tsconfig.jest.json b/packages/sdk/tsconfig.jest.json
index 1a9cbfd327..3e3278ed0b 100644
--- a/packages/sdk/tsconfig.jest.json
+++ b/packages/sdk/tsconfig.jest.json
@@ -1,29 +1,26 @@
 {
   "extends": "../../tsconfig.jest.json",
   "compilerOptions": {
-    "noEmit": true,
-    "lib": ["es2021", "dom"],
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "resolveJsonModule": true,
     "noImplicitOverride": false
   },
   "include": [
-    "package.json",
+    "bin",
     "src",
     "src/**/*.json",
-    "bin",
     "test",
-    "test/**/*.json",
-    "scripts"
+    "test/**/*.json"
   ],
   "exclude": [
-    "test/exports",
-    "src/exports-esm.mjs"
+    "src/exports-esm.mjs",
+    "test/exports"
   ],
   "references": [
     { "path": "../test-utils/tsconfig.node.json" },
     { "path": "../dht/tsconfig.node.json" },
-    { "path": "../trackerless-network/tsconfig.node.json" }
+    { "path": "../trackerless-network/tsconfig.node.json" },
+    { "path": "../utils/tsconfig.node.json" },
+    { "path": "../proto-rpc/tsconfig.node.json" }
   ]
 }
diff --git a/packages/sdk/tsconfig.json b/packages/sdk/tsconfig.json
index 8f24c2e23c..86445ab0b2 100644
--- a/packages/sdk/tsconfig.json
+++ b/packages/sdk/tsconfig.json
@@ -4,6 +4,7 @@
     "composite": true
   },
   "references": [
+    { "path": "./tsconfig.node.json" },
     { "path": "./tsconfig.jest.json" }
   ]
 }
diff --git a/packages/sdk/tsconfig.node.json b/packages/sdk/tsconfig.node.json
index 30c715c078..84cbbfdcd4 100644
--- a/packages/sdk/tsconfig.node.json
+++ b/packages/sdk/tsconfig.node.json
@@ -3,13 +3,12 @@
   "compilerOptions": {
     "outDir": "dist",
     "declarationDir": "dist/types",
-    "lib": ["es2021", "dom"],
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "resolveJsonModule": true,
     "noImplicitOverride": false
   },
   "include": [
+    "bin",
     "src",
     "src/**/*.json"
   ],
@@ -17,9 +16,9 @@
     "src/exports-esm.mjs"
   ],
   "references": [
-    { "path": "../test-utils/tsconfig.node.json" },
     { "path": "../trackerless-network/tsconfig.node.json" },
-    { "path": "../dht/tsconfig.node.json" }
-    
+    { "path": "../dht/tsconfig.node.json" },
+    { "path": "../utils/tsconfig.node.json" },
+    { "path": "../proto-rpc/tsconfig.node.json" }
   ]
 }