diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index e57707067..7af00e4b6 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -38,8 +38,6 @@ jobs:
 
     - name: Setup pnpm
       uses: pnpm/action-setup@v4
-      with:
-        version: 10.3.0
     - name: Setup node.js
       uses: actions/setup-node@v4
       with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2d977546f..eeb6c6bec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,8 +21,6 @@ jobs:
     - uses: actions/checkout@v4
     - name: Setup pnpm
       uses: pnpm/action-setup@v4
-      with:
-        version: 10.3.0
     - name: Setup node.js
       uses: actions/setup-node@v4
       with:
@@ -92,8 +90,6 @@ jobs:
     - uses: actions/checkout@v4
     - name: Setup pnpm
       uses: pnpm/action-setup@v4
-      with:
-        version: 10.3.0
     - name: Setup node.js
       uses: actions/setup-node@v4
       with:
@@ -168,8 +164,6 @@ jobs:
     - uses: actions/checkout@v4
     - name: Setup pnpm
       uses: pnpm/action-setup@v4
-      with:
-        version: 10.3.0
     - name: Setup node.js
       uses: actions/setup-node@v4
       with:
@@ -277,8 +271,6 @@ jobs:
     - uses: actions/checkout@v4
     - name: Setup pnpm
       uses: pnpm/action-setup@v4
-      with:
-        version: 10.3.0
     - name: Setup node.js
       uses: actions/setup-node@v4
       with:
@@ -369,8 +361,6 @@ jobs:
     - uses: actions/checkout@v4
     - name: Setup pnpm
       uses: pnpm/action-setup@v4
-      with:
-        version: 10.3.0
     - name: Setup node.js
       uses: actions/setup-node@v4
       with:
@@ -411,8 +401,6 @@ jobs:
 
     - name: Setup pnpm
       uses: pnpm/action-setup@v4
-      with:
-        version: 10.3.0
     - name: Setup node.js
       uses: actions/setup-node@v4
       with:
diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml
index 0c2adaa1f..184f482be 100644
--- a/.github/workflows/danger.yml
+++ b/.github/workflows/danger.yml
@@ -15,8 +15,6 @@ jobs:
           fetch-depth: 0 # fetch all history
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 10.3.0
       - name: Setup node.js
         uses: actions/setup-node@v4
         with:
diff --git a/.github/workflows/icu-book.yml b/.github/workflows/icu-book.yml
index 33627f606..a882030ef 100644
--- a/.github/workflows/icu-book.yml
+++ b/.github/workflows/icu-book.yml
@@ -16,8 +16,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 10.3.0
       - name: Setup node.js
         uses: actions/setup-node@v4
         with:
diff --git a/.github/workflows/stories.yml b/.github/workflows/stories.yml
index 4e9a2ea59..ab444728e 100644
--- a/.github/workflows/stories.yml
+++ b/.github/workflows/stories.yml
@@ -16,8 +16,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Setup pnpm
         uses: pnpm/action-setup@v4
-        with:
-          version: 10.3.0
       - name: Setup node.js
         uses: actions/setup-node@v4
         with:
diff --git a/.nvmrc b/.nvmrc
index 0254b1e63..7d41c735d 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.18.2
+22.14.0
diff --git a/package.json b/package.json
index 5fac34b5b..a27d8db31 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "$schema": "./package.schema.json",
+  "packageManager": "pnpm@10.6.4",
   "name": "signal-desktop",
   "productName": "Signal",
   "description": "Private messaging from your desktop",
@@ -292,7 +293,7 @@
     "csv-parse": "5.5.6",
     "danger": "12.3.3",
     "debug": "4.3.7",
-    "electron": "34.2.0",
+    "electron": "35.0.2",
     "electron-builder": "26.0.10",
     "electron-mocha": "13.0.1",
     "endanger": "7.0.4",
@@ -403,7 +404,7 @@
     ]
   },
   "engines": {
-    "node": "20.18.2"
+    "node": "22.14.0"
   },
   "build": {
     "appId": "org.whispersystems.signal-desktop",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e2a1b55c3..a0f2f8ba3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -648,8 +648,8 @@ importers:
         specifier: 4.3.7
         version: 4.3.7(supports-color@8.1.1)
       electron:
-        specifier: 34.2.0
-        version: 34.2.0
+        specifier: 35.0.2
+        version: 35.0.2
       electron-builder:
         specifier: 26.0.10
         version: 26.0.10(electron-builder-squirrel-windows@26.0.10)
@@ -4817,8 +4817,8 @@ packages:
     engines: {node: '>= 12.20.55'}
     hasBin: true
 
-  electron@34.2.0:
-    resolution: {integrity: sha512-SYwBJNeXBTm1q/ErybQMUBZAYqEreBUqBwTrNkw1rV4YatDZk5Aittpcus3PPeC4UoI/tqmJ946uG8AKHTd6CA==}
+  electron@35.0.2:
+    resolution: {integrity: sha512-jo8S4GfBpVIBDGitUrv+Vo/I/ZEEs6IvWprG2KJlxayYIKpufulbQaxDt78cC/79FwFo8MA0JOIwx/b9r5NRag==}
     engines: {node: '>= 12.20.55'}
     hasBin: true
 
@@ -14996,10 +14996,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  electron@34.2.0:
+  electron@35.0.2:
     dependencies:
       '@electron/get': 2.0.3
-      '@types/node': 20.17.6
+      '@types/node': 22.13.4
       extract-zip: 2.0.1
     transitivePeerDependencies:
       - supports-color
diff --git a/sticker-creator/package.json b/sticker-creator/package.json
index 693404e04..1bfa6d327 100644
--- a/sticker-creator/package.json
+++ b/sticker-creator/package.json
@@ -1,4 +1,5 @@
 {
+  "packageManager": "pnpm@10.6.4",
   "name": "signal-art-creator",
   "private": true,
   "version": "0.0.0",
diff --git a/ts/test-mock/messaging/unknown_contact_test.ts b/ts/test-mock/messaging/unknown_contact_test.ts
index cf12fafe0..629b38565 100644
--- a/ts/test-mock/messaging/unknown_contact_test.ts
+++ b/ts/test-mock/messaging/unknown_contact_test.ts
@@ -69,6 +69,9 @@ describe('unknown contacts', function (this: Mocha.Suite) {
     debug('accepting message request');
     await page.getByText('message you and share your name').waitFor();
     await page.getByRole('button', { name: 'Accept' }).click();
+    await page.getByText('message you and share your name').waitFor({
+      state: 'detached',
+    });
     assert.strictEqual(
       await page.getByText('message you and share your name').count(),
       0
diff --git a/ts/test-node/util/toWebStream_test.ts b/ts/test-node/util/toWebStream_test.ts
index 032b2c1c8..618ae0dd5 100644
--- a/ts/test-node/util/toWebStream_test.ts
+++ b/ts/test-node/util/toWebStream_test.ts
@@ -11,6 +11,7 @@ describe('toWebStream', () => {
     const CHUNK_SIZE = 16 * 1024;
     let pushed = 0;
     const readable = new Readable({
+      highWaterMark: CHUNK_SIZE,
       read() {
         pushed += 1;
         this.push(Buffer.alloc(CHUNK_SIZE));