diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0843af0d8826..0cc9c83f7a68 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,7 +6,7 @@ version: 2.1
 executors:
   mask_node:
     docker:
-      - image: circleci/node:15.3.0
+      - image: cimg/node:17.5
     working_directory: ~/repo
 commands:
   restore_workspace:
@@ -24,8 +24,8 @@ jobs:
           keys:
             - v3-mask-cache-pnpm
       - run:
-          name: Install PNPM
-          command: sudo npm install -g pnpm@6.4.0
+          name: Enable corepack
+          command: sudo corepack enable
       - run:
           name: Install Dependencies
           command: pnpm install --frozen-lockfile --store-dir ~/.pnpm/
@@ -43,8 +43,8 @@ jobs:
     steps:
       - restore_workspace
       - run:
-          name: Install PNPM
-          command: sudo npm install -g pnpm@6.4.0
+          name: Enable corepack
+          command: sudo corepack enable
       - run:
           name: Build Mask Network
           command: npx gulp build-ci
diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
index b6b4f682a84f..4fe43c6783ed 100644
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -28,9 +28,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
-      - uses: pnpm/action-setup@v2
-        with:
-          version: '6.23.1'
+      - uses: pnpm/action-setup@v2.2.1
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
diff --git a/.github/workflows/deploy-proxy.yml b/.github/workflows/deploy-proxy.yml
index 2ed47950b5f9..9771c3681ce2 100644
--- a/.github/workflows/deploy-proxy.yml
+++ b/.github/workflows/deploy-proxy.yml
@@ -17,9 +17,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
-      - uses: pnpm/action-setup@v2
-        with:
-          version: latest
+      - uses: pnpm/action-setup@v2.2.1
       - uses: actions/setup-node@v2
         with:
           cache: pnpm
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index fe364e86fbad..fbff2b9bc44c 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -52,9 +52,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-      - uses: pnpm/action-setup@v2
-        with:
-          version: "6.23.1"
+      - uses: pnpm/action-setup@v2.2.1
       - uses: actions/setup-node@v2
         with:
           node-version: "16"
@@ -71,9 +69,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-      - uses: pnpm/action-setup@v2
-        with:
-          version: "6.23.1"
+      - uses: pnpm/action-setup@v2.2.1
       - uses: actions/setup-node@v2
         with:
           node-version: "16"
@@ -88,9 +84,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           ref: ${{ github.event.pull_request.head.sha }}
-      - uses: pnpm/action-setup@v2
-        with:
-          version: "6.23.1"
+      - uses: pnpm/action-setup@v2.2.1
       - uses: actions/setup-node@v2
         with:
           node-version: "16"
diff --git a/.github/workflows/netlify.yml b/.github/workflows/netlify.yml
index 0b00d7b3be51..f044a9dbd179 100644
--- a/.github/workflows/netlify.yml
+++ b/.github/workflows/netlify.yml
@@ -27,9 +27,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
-      - uses: pnpm/action-setup@v2
-        with:
-          version: '6.23.1'
+      - uses: pnpm/action-setup@v2.2.1
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
diff --git a/cspell.json b/cspell.json
index f1b3c94c1aef..d49cdd918982 100644
--- a/cspell.json
+++ b/cspell.json
@@ -59,6 +59,7 @@
         "contrib",
         "contribs",
         "cooldown",
+        "corepack",
         "counterparty",
         "cyberconnect",
         "cyberlab",
@@ -399,6 +400,10 @@
         {
             "filename": "**/qya-AA.json",
             "enabled": false
+        },
+        {
+            "filename": ".circleci/config.yml",
+            "ignoreWords": ["cimg"]
         }
     ]
 }
diff --git a/docs/caveats.md b/docs/caveats.md
index e09511ac416c..476773684f88 100644
--- a/docs/caveats.md
+++ b/docs/caveats.md
@@ -19,8 +19,8 @@ This section is going to help you to set up the development environment of Mask
 
 To develop Mask Network, you need to have ...
 
-- Node 15 or higher
-- [pnpm](https://pnpm.js.org) 5+
+- Node 16 or higher
+- [pnpm](https://pnpm.js.org) 6.32.1
 
 ## Development
 
diff --git a/package.json b/package.json
index c13aba45e43c..874c4041d5f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mask-network",
-  "packageManager": "pnpm@6.30.1",
+  "packageManager": "pnpm@6.32.1",
   "version": "2.5.0",
   "private": true,
   "license": "AGPL-3.0-or-later",
@@ -79,7 +79,7 @@
   },
   "engines": {
     "node": ">=16.0.0",
-    "pnpm": ">=6"
+    "pnpm": ">=6.32.1"
   },
   "pnpm": {
     "overrides": {