diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 41b7f3089..aa105bd6d 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -4,7 +4,7 @@ updates:
 
   - package-ecosystem: "docker"
     directories:
-      - "**/*"
+      - "/*"
     schedule:
       interval: "daily"
     commit-message:
@@ -25,13 +25,12 @@ updates:
           - "major"
 
   - package-ecosystem: "github-actions"
-    directory: "/"
+    directories:
+      - "/*"
     schedule:
       interval: "daily"
     commit-message:
       prefix: "CCM-9336: "
-    cooldown:
-      default-days: 7
     groups:
       patch-and-minor:
         patterns:
@@ -44,32 +43,113 @@ updates:
           - "*"
         update-types:
           - "major"
+    cooldown:
+      default-days: 7
 
   - package-ecosystem: "npm"
+    # Refers to root directory only as updating pnpm workspaces from inside a workspace subdirectory is not supported
     directories:
       - "/"
-      - "/sandbox"
     schedule:
       interval: "daily"
     commit-message:
       prefix: "CCM-9336: "
     cooldown:
       default-days: 7
+    open-pull-requests-limit: 15
     groups:
-      patch-and-minor:
+      aws-sdk-major:
         patterns:
-          - "*"
+          - "@aws-sdk/*"
+        update-types:
+          - "major"
+      aws-sdk-minor-patch:
+        patterns:
+          - "@aws-sdk/*"
+        update-types:
+          - "minor"
+          - "patch"
+      eslint-major:
+        patterns:
+          - "eslint"
+          - "eslint-*"
+          - "@eslint/*"
+          - "@typescript-eslint/*"
+          - "typescript-eslint"
+          - "@stylistic/*"
+        update-types:
+          - "major"
+      eslint-minor-patch:
+        patterns:
+          - "eslint"
+          - "eslint-*"
+          - "@eslint/*"
+          - "@typescript-eslint/*"
+          - "typescript-eslint"
+          - "@stylistic/*"
+        update-types:
+          - "minor"
+          - "patch"
+      jest-major:
+        patterns:
+          - "jest"
+          - "jest-*"
+          - "ts-jest"
+          - "@types/jest"
+        update-types:
+          - "major"
+      jest-minor-patch:
+        patterns:
+          - "jest"
+          - "jest-*"
+          - "ts-jest"
+          - "@types/jest"
+        update-types:
+          - "minor"
+          - "patch"
+      typescript-major:
+        patterns:
+          - "typescript"
+          - "ts-node"
+          - "tsx"
+          - "@tsconfig/*"
+        update-types:
+          - "major"
+      typescript-minor-patch:
+        patterns:
+          - "typescript"
+          - "ts-node"
+          - "tsx"
+          - "@tsconfig/*"
         update-types:
           - "minor"
           - "patch"
+      # Catch-all groups for everything that isn't grouped above
       major:
         patterns:
           - "*"
         update-types:
           - "major"
+      minor-patch:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"
+    ignore:
+      - dependency-name: "@types/node"
+        update-types:
+          - "version-update:semver-major"
+      - dependency-name: "eslint"
+        update-types:
+          - "version-update:semver-major"
+      - dependency-name: "typescript"
+        update-types:
+          - "version-update:semver-major"
+
   - package-ecosystem: "pip"
     directories:
-      - "**/*"
+      - "/*"
     schedule:
       interval: "daily"
     commit-message:
@@ -91,7 +171,7 @@ updates:
 
   - package-ecosystem: "terraform"
     directories:
-      - "/infrastructure/terraform/**/*"
+      - "/*"
     schedule:
       interval: "daily"
     commit-message: