diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index b6f8145..95e1e4f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,30 +4,35 @@
 # https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
 
 version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: '/'
-    schedule:
-      interval: monthly
-    groups:
-      github-actions:
-        patterns:
-          - '*'
 
-  - package-ecosystem: npm
-    directory: '/'
+multi-ecosystem-groups:
+  dependencies:
     schedule:
-      interval: monthly
-    groups:
-      npm-dependencies:
-        patterns:
-          - '*'
+      interval: "monthly"
+
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    patterns:
+      - "*"
+    multi-ecosystem-group: "dependencies"
+    cooldown:
+      default-days: 7
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    patterns:
+      - "*"
+    multi-ecosystem-group: "dependencies"
+    cooldown:
+      default-days: 7
+
+  - package-ecosystem: "terraform"
+    directory: "/terraform"
+    patterns:
+      - "*"
+    multi-ecosystem-group: "dependencies"
+    cooldown:
+      default-days: 7
+
 
-  - package-ecosystem: terraform
-    directory: /terraform
-    schedule:
-      interval: monthly
-    groups:
-      terraform:
-        patterns:
-          - '*'
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ba51c7d..909d534 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,8 +35,9 @@ jobs:
           github-token: '${{ secrets.GITHUB_TOKEN }}'
 
       - name: Enable auto-merge for Dependabot PRs
-        if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
-        run: gh pr merge --squash "$PR_URL"
+        if: steps.metadata.outputs.update-type != 'version-update:semver-major'
+        run: gh pr merge --auto --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+