diff --git a/.github/dependabot-auto-merge.yml b/.github/dependabot-auto-merge.yml
deleted file mode 100644
index e0c89e72..00000000
--- a/.github/dependabot-auto-merge.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-- match:
-    dependency_type: "all"
-    update_type: "all"
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 3c797d98..bc335bdd 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,6 +9,10 @@ updates:
     rebase-strategy: auto
     assignees:
       - poad
+    groups:
+      actions:
+        patterns:
+          - '*'
 
   - package-ecosystem: npm
     directory: '/'
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index d53f073c..9325d4c4 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -1,25 +1,24 @@
-name: auto-merge
+name: pull-request-auto-merge
 
 on:
   pull_request:
-    branches: [ main ]
 
 permissions:
   id-token: write
-  contents: read
-
+  contents: write
+  pull-requests: write
+  checks: write
 
 jobs:
-  configure:
+  pull-request-auto-merge:
     runs-on: ubuntu-latest
-    if: github.actor != 'dependabot[bot]'
     steps:
-    - name: Pull request auto merge enabler
-      if: github.event_name == 'pull_request'
-      uses: poad/github-pull-request-auto-merge-enable-action@v2.1.0
-      with:
-        pull_request_number: ${{ github.event.pull_request.number }}
-        github_token: ${{ secrets.PERSONAL_TOKEN_FOR_GITHUB_ACTIONS }}
-        repository: ${{ github.event.repository.name }}
-        owner: ${{ github.repository_owner }}
-        merge_method: SQUASH
+      - uses: actions/checkout@v4
+
+      - name: Enable auto-merge for Pull Request
+        run: |
+          gh pr review --approve "$PR_URL"
+          gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c2fa9c77..f32d2c4d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x, 20.x]
+        node-version: [22.x]
 
     steps:
       - name: Checkout
diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml
deleted file mode 100644
index 38023180..00000000
--- a/.github/workflows/dependabot-auto-merge.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: pill-request-auto-merge
-
-on:
-  pull_request:
-
-permissions:
-  id-token: write
-  contents: write
-  pull-requests: write
-  checks: write
-
-jobs:
-  pull-request-auto-merge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Enable auto-merge for Pull Request
-        run: |
-          gh pr review --approve "$PR_URL"
-          gh pr merge --auto --squash "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/package.json b/package.json
index 6c6ee0a6..ccdb8a42 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,8 @@
   "pnpm": {
     "overrides": {
       "cross-spawn@<7.0.5": ">=7.0.5",
-      "webpack": ">=5.94.0"
+      "webpack": ">=5.94.0",
+      "webpack@>=5.0.0-alpha.0 <5.94.0": ">=5.94.0"
     }
   }
 }