diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 0c90f35a4b52..5c5df98c5f2f 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,57 +1,49 @@
 version: 2
-updates:
-  - package-ecosystem: 'github-actions'
-    directory: /
-    schedule:
-      interval: daily
-    labels:
-      - 'no-changelog'
-    cooldown:
-      default-days: 7
-
-  - package-ecosystem: 'github-actions'
-    directory: .github/actions/build-vsix
+multi-ecosystem-groups:
+  dependencies:
     schedule:
       interval: daily
-    labels:
-      - 'no-changelog'
-    cooldown:
-      default-days: 7
+    open-pull-requests-limit: 1
 
+updates:
   - package-ecosystem: 'github-actions'
-    directory: .github/actions/lint
-    schedule:
-      interval: daily
+    directories:
+      - /
+      - /.github/actions/build-vsix
+      - /.github/actions/lint
+      - /.github/actions/smoke-tests
+    patterns: ['*']
+    multi-ecosystem-group: dependencies
     labels:
+      - 'dependencies'
       - 'no-changelog'
     cooldown:
       default-days: 7
 
-  - package-ecosystem: 'github-actions'
-    directory: .github/actions/smoke-test
-    schedule:
-      interval: daily
+  - package-ecosystem: 'npm'
+    directories:
+      - /
+      - /pythonExtensionApi
+    patterns: ['*']
+    multi-ecosystem-group: dependencies
     labels:
+      - 'dependencies'
       - 'no-changelog'
-    cooldown:
-      default-days: 7
+      - 'skip package*.json'
 
   # Not skipping the news for some Python dependencies in case it's actually useful to communicate to users.
   - package-ecosystem: 'pip'
-    directory: /
-    schedule:
-      interval: daily
+    directories:
+      - /
+      - /build
+      - /python_files/jedilsp_requirements
+    patterns: ['*']
+    multi-ecosystem-group: dependencies
     ignore:
       - dependency-name: prospector # Due to Python 2.7 and #14477.
       - dependency-name: pytest # Due to Python 2.7 and #13776.
       - dependency-name: py # Due to Python 2.7.
       - dependency-name: jedi-language-server
     labels:
+      - 'dependencies'
       - 'no-changelog'
-  # Activate when we feel ready to keep up with frequency.
-  # - package-ecosystem: 'npm'
-  #   directory: /
-  #   schedule:
-  #     interval: daily
-  #   default_labels:
-  #     - "no-changelog"
diff --git a/.github/workflows/dependabot-auto-approve.yml b/.github/workflows/dependabot-auto-approve.yml
new file mode 100644
index 000000000000..9104842f46c9
--- /dev/null
+++ b/.github/workflows/dependabot-auto-approve.yml
@@ -0,0 +1,20 @@
+name: Dependabot auto-approve
+
+on:
+  pull_request_target:
+    types: [opened, reopened, synchronize, ready_for_review]
+
+permissions:
+  pull-requests: write
+
+jobs:
+  approve:
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && !github.event.pull_request.draft
+    runs-on: ubuntu-latest
+    steps:
+      - name: Approve Dependabot PR
+        run: gh pr review "$PR_NUMBER" --approve --repo "$GH_REPO"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}