diff --git a/.github/actions/setup-runtime/action.yml b/.github/actions/setup-runtime/action.yml
index 18d3bfe7f..e28368e2a 100644
--- a/.github/actions/setup-runtime/action.yml
+++ b/.github/actions/setup-runtime/action.yml
@@ -36,17 +36,14 @@ runs:
       with:
         python-version-file: .tool-versions
 
-    - name: Install pnpm
+    - name: Set up pnpm and Node.js
       if: inputs.setup-node == 'true'
-      uses: pnpm/action-setup@b906affcce14559ad1aafd4ab0e942779e9f58b1
-
-    - name: Set up Node.js
-      if: inputs.setup-node == 'true'
-      uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f
+      uses: pnpm/setup@84cb39b217b10273981911c288cd62326dc7c6d2 # v2.0.2
       with:
-        node-version-file: .tool-versions
-        cache: pnpm
+        runtime: node@24
+        cache: true
         cache-dependency-path: ${{ inputs.cache-dependency-path }}
+        install: false
 
     - name: Install just
       uses: extractions/setup-just@53165ef7e734c5c07cb06b3c8e7b647c5aa16db3