diff --git a/.github/workflows/npm-push-event.yml b/.github/workflows/npm-push-event.yml
index a43f64e..ae6ad66 100644
--- a/.github/workflows/npm-push-event.yml
+++ b/.github/workflows/npm-push-event.yml
@@ -18,17 +18,16 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 22
           registry-url: https://registry.npmjs.org/
           scope: '@mochi-inc-japan'
 
-      - name: Install dependencies
+      - name: pnpm setup
         id: pnpm-setup
         run: corepack enable
 
       - name: Get pnpm store directory
         id: pnpm-cache
-        shell: bash
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
diff --git a/.github/workflows/test_and_lint.yml b/.github/workflows/test_and_lint.yml
index b02ba8d..6420c7e 100644
--- a/.github/workflows/test_and_lint.yml
+++ b/.github/workflows/test_and_lint.yml
@@ -13,18 +13,14 @@ jobs:
           fetch-depth: 0 # otherwise, you will failed to push refs to dest repo
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 22
 
-      - uses: pnpm/action-setup@v2
-        name: Install pnpm
-        id: pnpm-install
-        with:
-          version: 7
-          run_install: false
+      - name: pnpm setup
+        id: pnpm-setup
+        run: corepack enable
 
       - name: Get pnpm store directory
         id: pnpm-cache
-        shell: bash
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
diff --git a/packages/algolia-tools-cli-generator/package.json b/packages/algolia-tools-cli-generator/package.json
index 8436a6c..d256aa2 100644
--- a/packages/algolia-tools-cli-generator/package.json
+++ b/packages/algolia-tools-cli-generator/package.json
@@ -33,7 +33,7 @@
   },
   "peerDependencies": {
     "@algolia/client-search": ">=5.0.0",
-    "@mochi-inc-japan/algolia-tools": ">=3.0.0",
+    "@mochi-inc-japan/algolia-tools": ">=2.0.0",
     "algoliasearch": ">=5.0.0",
     "commander": ">=9.0.0",
     "typescript": ">=5.0.0"
diff --git a/packages/plugin-algolia-tools-firestore/package.json b/packages/plugin-algolia-tools-firestore/package.json
index 7648dbb..8b51894 100644
--- a/packages/plugin-algolia-tools-firestore/package.json
+++ b/packages/plugin-algolia-tools-firestore/package.json
@@ -26,8 +26,8 @@
     "firebase-tools": "^11.16.1"
   },
   "peerDependencies": {
-    "@mochi-inc-japan/algolia-tools": ">=3.0.0",
-    "@mochi-inc-japan/algolia-tools-cli-generator": ">=3.0.0",
+    "@mochi-inc-japan/algolia-tools": ">=2.0.5",
+    "@mochi-inc-japan/algolia-tools-cli-generator": ">=2.0.5",
     "commander": ">=9.0.0",
     "firebase-admin": ">=10.2.0",
     "typescript": ">=5.0.0"