diff --git a/.github/actions/cleanup-runner/action.yml b/.github/actions/cleanup-runner/action.yml
new file mode 100644
index 000000000..22edac443
--- /dev/null
+++ b/.github/actions/cleanup-runner/action.yml
@@ -0,0 +1,12 @@
+name: 'Cleanup Runner'
+description: 'Remove unused tools in the runner image to free disk space'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Remove unused tools in the runner image
+      shell: bash
+      run: |
+        sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
+        sudo docker image prune --all --force || true
+        sudo docker builder prune -a --force || true
diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml
deleted file mode 100644
index 046ca7663..000000000
--- a/.github/workflows/msrv.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: Check MSRV
-
-on:
-  push:
-    branches: [next]
-  pull_request:
-    types: [opened, reopened, synchronize]
-
-# Limits workflow concurrency to only the latest commit in the PR.
-concurrency:
-  group: "${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}"
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-
-env:
-  # Reduce cache usage by removing debug information.
-  CARGO_PROFILE_DEV_DEBUG: 0
-
-jobs:
-  # Check MSRV (aka `rust-version`) in `Cargo.toml` is valid for workspace members
-  msrv:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install -y jq
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-        with:
-          save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/next' }}
-      - name: Install cargo-msrv
-        run: cargo install cargo-msrv
-      - name: Check MSRV for each workspace member
-        run: |
-          ./scripts/check-msrv.sh
diff --git a/.github/workflows/publish-dry-run.yml b/.github/workflows/publish-dry-run.yml
index 9679c6d09..2acaab2fa 100644
--- a/.github/workflows/publish-dry-run.yml
+++ b/.github/workflows/publish-dry-run.yml
@@ -5,7 +5,11 @@ permissions:
 
 on:
   push:
-    branches: [main]
+    branches: [main, next]
+
+concurrency:
+  group: "${{ github.workflow }} @ ${{ github.ref }}"
+  cancel-in-progress: true
 
 jobs:
   publish-dry-run:
@@ -17,9 +21,22 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Cleanup large tools for build space
+        uses: ./.github/actions/cleanup-runner
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install -y jq
       - name: Update Rust toolchain
+        run: rustup update --no-self-update
+      - uses: Swatinem/rust-cache@v2
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-binstall
+      - name: Install cargo-msrv
+        run: cargo binstall --no-confirm --force cargo-msrv
+      - name: Check MSRV for each workspace member
         run: |
-          rustup update --no-self-update
+          export PATH="$HOME/.cargo/bin:$PATH"
+          ./scripts/check-msrv.sh
       - name: Run cargo publish dry-run
         run: cargo publish --workspace --dry-run
         env:
diff --git a/.github/workflows/publish-main.yml b/.github/workflows/publish-main.yml
index dcc12a71b..25fe4552c 100644
--- a/.github/workflows/publish-main.yml
+++ b/.github/workflows/publish-main.yml
@@ -34,9 +34,22 @@ jobs:
             exit 1
           fi
           echo "Release tag matches main HEAD — continuing."
+      - name: Cleanup large tools for build space
+        uses: ./.github/actions/cleanup-runner
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install -y jq
       - name: Update Rust toolchain
+        run: rustup update --no-self-update
+      - uses: Swatinem/rust-cache@v2
+      - uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-binstall
+      - name: Install cargo-msrv
+        run: cargo binstall --no-confirm --force cargo-msrv
+      - name: Check MSRV for each workspace member
         run: |
-          rustup update --no-self-update
+          export PATH="$HOME/.cargo/bin:$PATH"
+          ./scripts/check-msrv.sh
       - name: Run cargo publish
         run: cargo publish --workspace
         env: