diff --git a/.github/workflows/tests-build-images.yml b/.github/workflows/tests-build-images.yml
index 0916a111470..86063d638c3 100644
--- a/.github/workflows/tests-build-images.yml
+++ b/.github/workflows/tests-build-images.yml
@@ -2,9 +2,10 @@ on:
   workflow_call:
 
 jobs:
+  # TODO: try with x8
   build-drive:
     name: Build Drive image
-    runs-on: [ "self-hosted", "linux", "x64", "8x-ubuntu-platform" ]
+    runs-on: [ "self-hosted", "linux", "x64", "ubuntu-platform" ]
     steps:
       - name: Check out repo
         uses: actions/checkout@v4
@@ -28,14 +29,13 @@ 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
             cargo_registry_cache
             cargo_git
-#            target_amd64
 
+  # TODO: try with x8
   build-dapi:
     name: Build DAPI image
     runs-on: [ "self-hosted", "linux", "x64", "8x-ubuntu-platform" ]
@@ -68,12 +68,11 @@ jobs:
             cargo_registry_index
             cargo_registry_cache
             cargo_git
-#            target_wasm
-#            unplugged_amd64
 
+  # TODO: try with x8
   build-dashmate-helper:
     name: Build Dashmate helper image
-    runs-on: [ "self-hosted", "linux", "x64", "8x-ubuntu-platform" ]
+    runs-on: [ "self-hosted", "linux", "x64", "ubuntu-platform" ]
     steps:
       - name: Check out repo
         uses: actions/checkout@v4
@@ -97,11 +96,8 @@ 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
             cargo_registry_cache
             cargo_git
-#            target_wasm
-#            unplugged_amd64