diff --git a/.github/workflows/bench-pr.yml b/.github/workflows/bench-pr.yml
index 24c653e217..df8363446d 100644
--- a/.github/workflows/bench-pr.yml
+++ b/.github/workflows/bench-pr.yml
@@ -30,7 +30,7 @@ jobs:
       - image=ubuntu24-full-x64
       - disk=large
       - spot=false
-      - tag=${{ matrix.id }}
+      - tag=${{ matrix.benchmark.id }}
     strategy:
       matrix:
         benchmark:
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index 782bfbc1e4..d4dd85ff8a 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -36,7 +36,7 @@ jobs:
       - image=ubuntu24-full-x64
       - disk=large
       - spot=false
-      - tag=${{ matrix.id }}
+      - tag=${{ matrix.benchmark.id }}
     strategy:
       matrix:
         benchmark:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ba1ecc7576..ff7744b6f2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -103,7 +103,14 @@ jobs:
 
   rust-docs:
     name: "Rust (docs)"
-    runs-on: ubuntu-latest
+    runs-on:
+      - runs-on=${{ github.run_id }}
+      - family=m7i+m7i-flex+m7a
+      - cpu=8
+      - image=ubuntu24-full-x64
+      - disk=large
+      - spot=false
+      - tag=rust-docs
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-rust
@@ -112,7 +119,15 @@ jobs:
 
   build-rust:
     name: "Rust build (${{matrix.config.name}})"
-    runs-on: ubuntu-latest
+    runs-on:
+      - runs-on=${{ github.run_id }}
+      - family=m7i+m7i-flex+m7a
+      - cpu=8
+      - image=ubuntu24-full-x64
+      - disk=large
+      - spot=false
+      - tag=${{ matrix.config.name }}
+
     env:
       # disable lints for build, they will be caught in Rust lint job.
       RUSTFLAGS: '-A warnings'
@@ -142,13 +157,15 @@ jobs:
               rustflags: 'RUSTFLAGS="-A warnings --cfg getrandom_backend=\"wasm_js\""'
             args: "--target wasm32-unknown-unknown --exclude vortex --exclude vortex-datafusion --exclude vortex-tui"
     steps:
+      - uses: runs-on/action@v1
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/cleanup
       - uses: rui314/setup-mold@v1
-      - uses: ./.github/actions/setup-rust
         with:
           targets: ${{matrix.config.target || ''}}
       - uses: ./.github/actions/setup-c++
+      - name: Install wasm32 target
+        if: ${{ matrix.config.target == 'wasm32-unknown-unknown' }}
+        run: rustup target add wasm32-unknown-unknown
       - name: Install cargo-hack
         uses: taiki-e/install-action@cargo-hack
       - name: Rust Build (${{matrix.config.name}})
@@ -156,12 +173,18 @@ jobs:
 
   check-min-deps:
     name: "Check build with minimal dependencies"
-    runs-on: ubuntu-latest
+    runs-on:
+      - runs-on=${{ github.run_id }}
+      - family=m7i+m7i-flex+m7a
+      - cpu=8
+      - image=ubuntu24-full-x64
+      - disk=large
+      - spot=false
+      - tag=rust-min-deps
     steps:
+      - uses: runs-on/action@v1
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/cleanup
       - uses: rui314/setup-mold@v1
-      - uses: ./.github/actions/setup-rust
       - uses: ./.github/actions/setup-c++
       - uses: taiki-e/install-action@cargo-hack
       - uses: taiki-e/install-action@cargo-minimal-versions
@@ -169,12 +192,18 @@ jobs:
 
   rust-lint:
     name: "Rust (lint)"
-    runs-on: ubuntu-latest
+    runs-on:
+      - runs-on=${{ github.run_id }}
+      - family=m7i+m7i-flex+m7a
+      - cpu=8
+      - image=ubuntu24-full-x64
+      - disk=large
+      - spot=false
+      - tag=rust-lint
     steps:
+      - uses: runs-on/action@v1
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/cleanup
       - uses: rui314/setup-mold@v1
-      - uses: ./.github/actions/setup-rust
       - uses: ./.github/actions/setup-c++
       - name: Rust Lint - Format
         run: cargo fmt --all --check
diff --git a/.github/workflows/fuzz.yml b/.github/workflows/fuzz.yml
index 6d32272ac0..de98332101 100644
--- a/.github/workflows/fuzz.yml
+++ b/.github/workflows/fuzz.yml
@@ -14,6 +14,7 @@ jobs:
       - image=ubuntu24-full-x64
       - disk=large
       - tag=io-fuzz
+      - spot=false
     steps:
       - uses: runs-on/action@v1
       - uses: actions/checkout@v4
@@ -56,6 +57,7 @@ jobs:
       - image=ubuntu24-full-x64
       - disk=large
       - tag=ops-fuzz
+      - spot=false
     steps:
       - uses: runs-on/action@v1
       - uses: actions/checkout@v4
diff --git a/.github/workflows/generate-tpch-s3.yml b/.github/workflows/generate-tpch-s3.yml
index 4d68ecc178..78bf437211 100644
--- a/.github/workflows/generate-tpch-s3.yml
+++ b/.github/workflows/generate-tpch-s3.yml
@@ -20,6 +20,7 @@ jobs:
       - runs-on=${{ github.run_id }}
       - family=m7i.2xlarge
       - image=ubuntu24-full-x64
+      - spot=false
     env:
       REMOTE_PATH: s3://vortex-bench-dev-eu/tpch-sf1/
       TMPDIR: /work
diff --git a/.github/workflows/sql-benchmarks.yml b/.github/workflows/sql-benchmarks.yml
index 7251e6100c..d5f9cbff06 100644
--- a/.github/workflows/sql-benchmarks.yml
+++ b/.github/workflows/sql-benchmarks.yml
@@ -31,7 +31,7 @@ jobs:
       - image=ubuntu24-full-x64
       - disk=large
       - spot=false
-      - tag=${{ matrix.id }}
+      - tag=${{ matrix.include.id }}
 
     steps:
       - uses: runs-on/action@v1