diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 4a11152b4b..4e72680085 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -3,9 +3,7 @@ runs:
   using: "composite"
   steps:
     - uses: actions/checkout@v3
-    - uses: pnpm/action-setup@v2.2.2
-      with:
-        version: ${{ matrix.pnpm-version }}
+    - uses: pnpm/action-setup@v2
     - name: Set up Node ${{ matrix.node-version }}
       uses: actions/setup-node@v3
       with:
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index 5510f88eb2..829009d214 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -13,7 +13,6 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        pnpm-version: [7]
     steps:
       - uses: actions/checkout@v3
       - name: Setup
@@ -26,7 +25,6 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        pnpm-version: [7]
     steps:
       - uses: actions/checkout@v3
       - name: Setup
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 8eddd17a47..6d5b77659e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,6 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        pnpm-version: [7]
     steps:
       - uses: actions/checkout@v3
       - name: Setup
@@ -29,7 +28,6 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        pnpm-version: [7]
     steps:
       - uses: actions/checkout@v3
       - name: Setup
@@ -59,7 +57,6 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        pnpm-version: [7]
     steps:
       - uses: actions/checkout@v3
       - name: Setup
@@ -74,7 +71,6 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        pnpm-version: [7]
         shard: [1, 2, 3]
         total-shards: [3]
         transport-mode: ['http', 'webSocket']
@@ -112,7 +108,6 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        pnpm-version: [7]
     steps:
       - uses: actions/checkout@v3
       - name: Setup
@@ -129,7 +124,6 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        pnpm-version: [7]
     steps:
       - uses: actions/checkout@v3
       - name: Setup
diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-canary.yml
index cd607df3a3..89627ab9f2 100644
--- a/.github/workflows/release-canary.yml
+++ b/.github/workflows/release-canary.yml
@@ -16,14 +16,11 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        pnpm-version: [7]
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - uses: pnpm/action-setup@v2.2.2
-        with:
-          version: ${{ matrix.pnpm-version }}
+      - uses: pnpm/action-setup@v2
       - name: Set up Node ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index aafa27abb2..b235e38c3a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,16 +12,13 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        pnpm-version: [7]
     steps:
       - uses: actions/checkout@v3
         with:
           # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
           fetch-depth: 0
 
-      - uses: pnpm/action-setup@v2.2.2
-        with:
-          version: ${{ matrix.pnpm-version }}
+      - uses: pnpm/action-setup@v2
       - name: Set up Node ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
diff --git a/.github/workflows/size.yml b/.github/workflows/size.yml
index ab3731bfbe..aa7025663b 100644
--- a/.github/workflows/size.yml
+++ b/.github/workflows/size.yml
@@ -9,11 +9,10 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        pnpm-version: [7]
     steps:
       - uses: actions/checkout@v3
       - name: Setup
         uses: ./.github/actions/setup
       - uses: preactjs/compressed-size-action@v2
         with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
\ No newline at end of file
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index eba17672a0..e88de321a5 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -9,7 +9,6 @@ jobs:
     strategy:
       matrix:
         node-version: [18]
-        pnpm-version: [7]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -17,9 +16,7 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - uses: pnpm/action-setup@v2.2.2
-        with:
-          version: ${{ matrix.pnpm-version }}
+      - uses: pnpm/action-setup@v2
       - name: Set up Node ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with: