diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 6d7cbd2..667cf2d 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -3,36 +3,133 @@ version: 2
 updates:
 
   - package-ecosystem: "docker"
-    directory: "/"
+    directories:
+      - "/*"
     schedule:
       interval: "daily"
     commit-message:
       prefix: "CCM-9336: "
+    groups:
+      patch-and-minor:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
+      major:
+        patterns:
+          - "*"
+        update-types:
+          - "major"
+    cooldown:
+      default-days: 7
 
   - package-ecosystem: "github-actions"
-    directory: "/"
+    directories:
+      - "/*"
     schedule:
       interval: "daily"
     commit-message:
       prefix: "CCM-9336: "
+    groups:
+      patch-and-minor:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
+      major:
+        patterns:
+          - "*"
+        update-types:
+          - "major"
+    cooldown:
+      default-days: 7
 
   - package-ecosystem: "npm"
-    directory: "/"
+    directories:
+      - "/*"
     schedule:
       interval: "daily"
     commit-message:
       prefix: "CCM-9336: "
+    groups:
+      patch-and-minor:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
+      major:
+        patterns:
+          - "*"
+        update-types:
+          - "major"
+    cooldown:
+      default-days: 7
 
   - package-ecosystem: "pip"
-    directory: "/"
+    directories:
+      - "/*"
     schedule:
       interval: "daily"
     commit-message:
       prefix: "CCM-9336: "
+    groups:
+      patch-and-minor:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
+      major:
+        patterns:
+          - "*"
+        update-types:
+          - "major"
+    cooldown:
+      default-days: 7
 
   - package-ecosystem: "terraform"
-    directory: "/"
+    directories:
+      - "/*"
     schedule:
       interval: "daily"
     commit-message:
       prefix: "CCM-9336: "
+    groups:
+      patch-and-minor:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
+      major:
+        patterns:
+          - "*"
+        update-types:
+          - "major"
+    cooldown:
+      default-days: 7
+
+  - package-ecosystem: "bundler"
+    directories:
+      - "/*"
+    schedule:
+      interval: "daily"
+    commit-message:
+      prefix: "CCM-9336: "
+    groups:
+      patch-and-minor:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
+      major:
+        patterns:
+          - "*"
+        update-types:
+          - "major"
+    cooldown:
+      default-days: 7
diff --git a/.github/workflows/manual-combine-dependabot-prs.yaml b/.github/workflows/manual-combine-dependabot-prs.yaml
deleted file mode 100644
index f1a8879..0000000
--- a/.github/workflows/manual-combine-dependabot-prs.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Combine Dependabot PRs
-
-on:
-  workflow_dispatch:
-
-permissions:
-  contents: write
-  pull-requests: write
-  checks: read
-
-jobs:
-  combine-prs:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: combine-prs
-        id: combine-prs
-        uses: ./.github/actions/combine-dependabot-prs
-        with:
-          ci_required: false
-          labels: dependencies
-          pr_title: "CCM-9336: Combined Dependabot PRs"
-          combine_branch_name: dependabotCombined
-          pr_body_header: "CCM-9336: Combined Dependabot PRs"