diff --git a/.github/workflows/aiter-test.yaml b/.github/workflows/aiter-test.yaml
index 8ceebe9051..8923777b27 100644
--- a/.github/workflows/aiter-test.yaml
+++ b/.github/workflows/aiter-test.yaml
@@ -44,7 +44,7 @@ jobs:
 
   build_aiter_image:
     if: ${{ !github.event.pull_request || github.event.pull_request.draft == false }}
-    runs-on: linux-aiter-mi300x-1
+    runs-on: build-only-aiter
     needs: check-signal
     permissions:
       id-token: write
diff --git a/.github/workflows/vllm_benchmark.yaml b/.github/workflows/vllm_benchmark.yaml
index 15a8056cb0..865b9bebba 100644
--- a/.github/workflows/vllm_benchmark.yaml
+++ b/.github/workflows/vllm_benchmark.yaml
@@ -45,7 +45,7 @@ jobs:
       (contains(github.event.pull_request.labels.*.name, 'ci:vllm') ||
       contains(github.event.pull_request.labels.*.name, 'ci:all')))
     needs: [check-signal]
-    runs-on: linux-aiter-mi300x-1
+    runs-on: build-only-aiter
 
     steps:
       - name: Checkout aiter repo