diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml
index 1e8c73e0d..4365150fe 100644
--- a/.github/workflows/backend-tests.yml
+++ b/.github/workflows/backend-tests.yml
@@ -76,6 +76,22 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
+      - uses: pnpm/action-setup@v3
+        name: Install pnpm
+        with:
+          version: 8
+          run_install: false
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+      - uses: actions/cache@v3
+        name: Setup pnpm cache
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
       -
         name: Install libreoffice
         run: |
@@ -87,7 +103,7 @@ jobs:
         # The --legacy-peer-deps flag is required to work around a bug in npm v7:
         # https://github.com/npm/cli/issues/2199
         run: >
-          npm install --no-save --legacy-peer-deps
+          pnpm install --no-save
           ep_align
           ep_author_hover
           ep_cursortrace
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5c3340d0d..6b92be544 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -39,7 +39,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
-          cache: 'npm'
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml
index 860c3b360..5266c8f25 100644
--- a/.github/workflows/frontend-tests.yml
+++ b/.github/workflows/frontend-tests.yml
@@ -26,7 +26,6 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 21
-          cache: 'npm'
       - uses: pnpm/action-setup@v3
         name: Install pnpm
         with:
@@ -99,7 +98,7 @@ jobs:
         # The --legacy-peer-deps flag is required to work around a bug in npm v7:
         # https://github.com/npm/cli/issues/2199
         run: >
-          npm install --no-save --legacy-peer-deps
+          pnpm install
           ep_align
           ep_author_hover
           ep_cursortrace
diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml
index 56e94eba4..0b7cfacc8 100644
--- a/.github/workflows/load-test.yml
+++ b/.github/workflows/load-test.yml
@@ -73,7 +73,7 @@ jobs:
         # The --legacy-peer-deps flag is required to work around a bug in npm v7:
         # https://github.com/npm/cli/issues/2199
         run: >
-          npm install --no-save --legacy-peer-deps
+          pnpm install --no-save
           ep_align
           ep_author_hover
           ep_cursortrace
diff --git a/.github/workflows/upgrade-from-latest-release.yml b/.github/workflows/upgrade-from-latest-release.yml
index 7fe7e10a1..681e9d67f 100644
--- a/.github/workflows/upgrade-from-latest-release.yml
+++ b/.github/workflows/upgrade-from-latest-release.yml
@@ -50,7 +50,7 @@ jobs:
         # The --legacy-peer-deps flag is required to work around a bug in npm
         # v7: https://github.com/npm/cli/issues/2199
         run: >
-          pnpm install --no-save --legacy-peer-deps
+          pnpm install --no-save
           ep_align
           ep_author_hover
           ep_cursortrace
diff --git a/src/bin/installOnWindows.bat b/src/bin/installOnWindows.bat
index a6700a9e9..acc8d4982 100644
--- a/src/bin/installOnWindows.bat
+++ b/src/bin/installOnWindows.bat
@@ -14,7 +14,7 @@ cd /D node_modules
 mklink /D "ep_etherpad-lite" "..\src"
 
 cd /D "ep_etherpad-lite"
-cmd /C npm ci --legacy-peer-deps || exit /B 1
+cmd /C pnpm i || exit /B 1
 
 cd /D "%~dp0\..\.."