diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 87367d2..e74217a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,14 +1,12 @@
 # Maintained in https://github.com/coreos/repo-templates
 # Do not edit downstream.
 
+# Updates are grouped together by ecosystem in a single PR. An update can be
+# removed from a combined update PR via comments to dependabot:
+# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/managing-pull-requests-for-dependency-updates#managing-dependabot-pull-requests-for-grouped-updates-with-comment-commands
+
 version: 2
 updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    labels: ["skip-notes"]
-    open-pull-requests-limit: 3
   - package-ecosystem: cargo
     directory: /
     schedule:
@@ -16,3 +14,8 @@ updates:
     open-pull-requests-limit: 10
     labels:
       - dependency
+
+    groups:
+      build:
+        patterns:
+          - "*"
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index c55c0e4..cfa93f4 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -18,7 +18,7 @@ concurrency:
 env:
   CARGO_TERM_COLOR: always
   # Pinned toolchain for linting
-  ACTIONS_LINTS_TOOLCHAIN: 1.86.0
+  ACTIONS_LINTS_TOOLCHAIN: 1.90.0
 
 jobs:
   tests-stable:
@@ -117,22 +117,3 @@ jobs:
         run: cargo build --all-targets
       - name: cargo test
         run: cargo test --all-targets
-  build-and-test:
-    name: Build and test on ${{ matrix.host }}
-    runs-on: ${{ matrix.host }}
-    strategy:
-      matrix:
-        host: [windows-latest, macos-latest]
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v6
-      - name: Install toolchain
-        uses: dtolnay/rust-toolchain@v1
-        with:
-          toolchain: stable
-      - name: Cache build artifacts
-        uses: Swatinem/rust-cache@v2
-      - name: cargo build
-        run: cargo build --all-targets
-      - name: cargo test
-        run: cargo test --all-targets