diff --git a/.github/workflows/api-testing.yml b/.github/workflows/api-testing.yml
index a226c8082..84d970a04 100644
--- a/.github/workflows/api-testing.yml
+++ b/.github/workflows/api-testing.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   test:
-    runs-on: blacksmith-16vcpu-ubuntu-2204
+    runs-on: blacksmith-32vcpu-ubuntu-2204
     environment: testing
 
     # Service container for Redis (needed by the setup action)
@@ -31,10 +31,23 @@ jobs:
       - name: Setup Test Environment
         uses: ./.github/actions/setup-test-environment
 
+      - name: Mount Cargo Home Cache (Sticky Disk)
+        uses: useblacksmith/stickydisk@v1
+        with:
+          key: ${{ github.repository }}-cargo-home # Unique key per repository
+          path: ~/.cargo # Cache cargo registry/git data
+
+      - name: Mount API Target Cache (Sticky Disk)
+        uses: useblacksmith/stickydisk@v1
+        with:
+          key: ${{ github.repository }}-api-target # Unique key per repository
+          path: ./api/target # Cache build artifacts
+
       - name: Run API Tests
         working-directory: ./api # Tests run from the api directory
         run: cargo test --workspace # Run tests for all packages in the api workspace
         env:
+          RUST_TEST_THREADS: 24
           # Use hardcoded default values and secrets
           DATABASE_URL: postgres://postgres:postgres@127.0.0.1:54322/postgres
           REDIS_URL: redis://localhost:6379 # Connect to the Redis service container
diff --git a/.github/workflows/cli-testing.yml b/.github/workflows/cli-testing.yml
index 26ab07aa4..12fb2f0cb 100644
--- a/.github/workflows/cli-testing.yml
+++ b/.github/workflows/cli-testing.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   test:
-    runs-on: blacksmith-16vcpu-ubuntu-2204 # Using a powerful runner as requested
+    runs-on: blacksmith-32vcpu-ubuntu-2204 # Using a powerful runner as requested
     environment: testing
 
     # Service containers
@@ -28,11 +28,6 @@ jobs:
         uses: actions/checkout@v4
 
       # --- Build API Docker Image with Blacksmith Caching ---
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Build and Load API Docker Image
         uses: useblacksmith/build-push-action@v1
         with:
@@ -85,6 +80,7 @@ jobs:
         working-directory: ./cli # Tests run from the cli directory
         run: cargo test --workspace # Run tests for all packages in the cli workspace
         env:
+          RUST_TEST_THREADS: 24
           # Point to services on host (DB/Supabase/Redis) and API container
           DATABASE_URL: postgres://postgres:postgres@127.0.0.1:54322/postgres
           REDIS_URL: redis://localhost:6379 # Tests run on host, connect to exposed Redis port
diff --git a/.github/workflows/web-testing.yml b/.github/workflows/web-testing.yml
index 7bedd9ec7..76b635f78 100644
--- a/.github/workflows/web-testing.yml
+++ b/.github/workflows/web-testing.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   test:
-    runs-on: blacksmith-16vcpu-ubuntu-2204
+    runs-on: blacksmith-32vcpu-ubuntu-2204
     environment: testing
 
     # Service containers
@@ -49,11 +49,6 @@ jobs:
         uses: ./.github/actions/setup-test-environment
 
       # --- Build API Docker Image with Blacksmith Caching ---
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
       - name: Build and Load API Docker Image
         uses: useblacksmith/build-push-action@v1
         with: