diff --git a/.github/workflows/tests-build-images.yml b/.github/workflows/tests-build-images.yml
index 8e8a322de6..0916a11147 100644
--- a/.github/workflows/tests-build-images.yml
+++ b/.github/workflows/tests-build-images.yml
@@ -4,7 +4,7 @@ on:
 jobs:
   build-drive:
     name: Build Drive image
-    runs-on: [ "self-hosted", "linux", "x64", "ubuntu-platform" ]
+    runs-on: [ "self-hosted", "linux", "x64", "8x-ubuntu-platform" ]
     steps:
       - name: Check out repo
         uses: actions/checkout@v4
@@ -28,6 +28,7 @@ jobs:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
           dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
           push: true
+          bucket: multi-runner-linux-x64-platform-8x-cache-wp1sy0o6
           region: ${{ vars.AWS_REGION }}
           cache_mounts: |
             cargo_registry_index
@@ -37,7 +38,7 @@ jobs:
 
   build-dapi:
     name: Build DAPI image
-    runs-on: [ "self-hosted", "linux", "x64", "ubuntu-platform" ]
+    runs-on: [ "self-hosted", "linux", "x64", "8x-ubuntu-platform" ]
     steps:
       - name: Check out repo
         uses: actions/checkout@v4
@@ -61,6 +62,7 @@ jobs:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
           dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
           push: true
+          bucket: multi-runner-linux-x64-platform-8x-cache-wp1sy0o6
           region: ${{ vars.AWS_REGION }}
           cache_mounts: |
             cargo_registry_index
@@ -71,7 +73,7 @@ jobs:
 
   build-dashmate-helper:
     name: Build Dashmate helper image
-    runs-on: [ "self-hosted", "linux", "x64", "ubuntu-platform" ]
+    runs-on: [ "self-hosted", "linux", "x64", "8x-ubuntu-platform" ]
     steps:
       - name: Check out repo
         uses: actions/checkout@v4
@@ -95,6 +97,7 @@ jobs:
           dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
           dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
           push: true
+          bucket: multi-runner-linux-x64-platform-8x-cache-wp1sy0o6
           region: ${{ vars.AWS_REGION }}
           cache_mounts: |
             cargo_registry_index
diff --git a/.github/workflows/tests-rs-package.yml b/.github/workflows/tests-rs-package.yml
index 86bc374852..229e52c02e 100644
--- a/.github/workflows/tests-rs-package.yml
+++ b/.github/workflows/tests-rs-package.yml
@@ -107,6 +107,7 @@ jobs:
             fi
           done
 
+  # TODO: run drive-abci tests with x8 runner or optimize tests
   test:
     name: Tests
     runs-on: [ "self-hosted", "linux", "x64", "ubuntu-platform" ]