diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 2b383b3..e2c6dbf 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,8 +1,11 @@
 version: 2
 updates:
-  # NuGet — versions are centrally managed in src/Directory.Packages.props (CPM).
+  # NuGet — versions are centrally managed in src/Directory.Packages.props (CPM),
+  # plus the nbgv dotnet tool in /.config/dotnet-tools.json.
   - package-ecosystem: "nuget"
-    directory: "/src"
+    directories:
+      - "/src"
+      - "/.config"
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
@@ -11,6 +14,12 @@ updates:
       avalonia:
         patterns:
           - "Avalonia*"
+      # Everything else lands in a single grouped PR, spanning both directories.
+      nuget:
+        patterns:
+          - "*"
+        exclude-patterns:
+          - "Avalonia*"
 
   # GitHub Actions used by the workflows.
   - package-ecosystem: "github-actions"
@@ -18,3 +27,7 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 5
+    groups:
+      actions:
+        patterns:
+          - "*"
diff --git a/CLAUDE.md b/CLAUDE.md
index 4867ecc..66ecf41 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -55,7 +55,7 @@ dotnet test src/Remote.Adb.slnx
 dotnet test src/Remote.Adb.slnx --filter "FullyQualifiedName~ClassName"
 ```
 
-The SDK is pinned to `10.0.0` (`rollForward: latestMinor`) via `src/global.json`. `src/Directory.Build.props` applies `LangVersion=default`, `ImplicitUsings=enable`, and `Nullable=enable` solution-wide, and references JetBrains.Annotations and Nerdbank.GitVersioning (version derived from git history).
+The SDK is pinned to `10.0.0` (`rollForward: latestMinor`) via `global.json` at the repo root. `src/Directory.Build.props` applies `LangVersion=default`, `ImplicitUsings=enable`, and `Nullable=enable` solution-wide, and references JetBrains.Annotations and Nerdbank.GitVersioning (version derived from git history).
 
 ## Package management