diff --git a/.github/workflows/sycl-clang-tidy.yml b/.github/workflows/sycl-clang-tidy.yml
index f9b4703d2ca35..8ec399f730ba8 100644
--- a/.github/workflows/sycl-clang-tidy.yml
+++ b/.github/workflows/sycl-clang-tidy.yml
@@ -20,7 +20,7 @@ permissions: read-all
 jobs:
   run-clang-tidy:
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'disable-lint') }}
-    runs-on: [Linux, build]
+    runs-on: [Linux, build-test]
     container:
       image: ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest
       options: -u 1001:1001
diff --git a/.github/workflows/sycl-coverity.yml b/.github/workflows/sycl-coverity.yml
index 3b5136daf9c97..07d399de247f3 100644
--- a/.github/workflows/sycl-coverity.yml
+++ b/.github/workflows/sycl-coverity.yml
@@ -22,7 +22,7 @@ jobs:
   coverity:
     if: github.repository == 'intel/llvm'
     name: Coverity
-    runs-on: [Linux, build]
+    runs-on: [Linux, build-test]
     container:
       image: ghcr.io/intel/llvm/ubuntu2404_intel_drivers:latest
       options: -u 1001:1001
diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml
index 74545ac3e52a3..baa6eb93d89f4 100644
--- a/.github/workflows/sycl-linux-build.yml
+++ b/.github/workflows/sycl-linux-build.yml
@@ -141,7 +141,7 @@ permissions: read-all
 jobs:
   build:
     name: Build + LIT
-    runs-on: [Linux, build]
+    runs-on: [Linux, build-test]
     container:
       image: ${{ inputs.build_image }}
       options: -u 1001:1001
diff --git a/.github/workflows/sycl-linux-precommit.yml b/.github/workflows/sycl-linux-precommit.yml
index cb15a89b68abd..98b191a527b4c 100644
--- a/.github/workflows/sycl-linux-precommit.yml
+++ b/.github/workflows/sycl-linux-precommit.yml
@@ -72,7 +72,7 @@ jobs:
   # build all the e2e tests
   build_run_native_cpu_e2e_tests:
     if: ${{ !cancelled() && needs.build.outputs.build_conclusion == 'success' }}
-    runs-on: [Linux, build]
+    runs-on: [Linux, build-test]
     needs: [build]
     container:
       image: ghcr.io/intel/llvm/sycl_ubuntu2404_nightly:latest
diff --git a/.github/workflows/sycl-nightly.yml b/.github/workflows/sycl-nightly.yml
index 443f20ec3e040..4304ddf1cf7a6 100644
--- a/.github/workflows/sycl-nightly.yml
+++ b/.github/workflows/sycl-nightly.yml
@@ -10,7 +10,7 @@ permissions: read-all
 jobs:
   check_abi_symbols:
     name: Check ABI symbols tests match release branch
-    runs-on: [Linux, build]
+    runs-on: [Linux, build-test]
     # We're in the ABI breaking window now, disabling until the next major
     # release.
     if: github.repository == 'intel/llvm' && false
diff --git a/.github/workflows/sycl-prebuilt-e2e-container.yml b/.github/workflows/sycl-prebuilt-e2e-container.yml
index 5cff39ddf1f73..dbeeabc73319c 100644
--- a/.github/workflows/sycl-prebuilt-e2e-container.yml
+++ b/.github/workflows/sycl-prebuilt-e2e-container.yml
@@ -39,7 +39,7 @@ jobs:
   # Couldn't make it work from inside the container, so have to use an extra job
   # and pass an artifact.
   docker:
-    runs-on: [Linux, build]
+    runs-on: [Linux, build-test]
     needs: build
     permissions:
       packages: write
diff --git a/.github/workflows/sycl-rel-container.yaml b/.github/workflows/sycl-rel-container.yaml
index 58a166f0cdd14..6f186ad544602 100644
--- a/.github/workflows/sycl-rel-container.yaml
+++ b/.github/workflows/sycl-rel-container.yaml
@@ -15,7 +15,7 @@ jobs:
   build_and_push_images:
     if: github.repository == 'intel/llvm'
     name: Build and Push Docker Images
-    runs-on: [Linux, build]
+    runs-on: [Linux, build-test]
     permissions:
       packages: write
     steps:
diff --git a/.github/workflows/sycl-weekly.yml b/.github/workflows/sycl-weekly.yml
index 124e70066950a..22716c6245b0f 100644
--- a/.github/workflows/sycl-weekly.yml
+++ b/.github/workflows/sycl-weekly.yml
@@ -29,7 +29,7 @@ jobs:
     uses: ./.github/workflows/sycl-linux-run-tests.yml
     with:
       name: Build SYCL-CTS
-      runner: '["Linux", "build"]'
+      runner: '["Linux", "build-test"]'
       testing_mode: 'build-only'
       image_options: -u 1001 --device=/dev/dri --privileged --cap-add SYS_ADMIN
       tests_selector: cts
diff --git a/.github/workflows/ur-build-offload.yml b/.github/workflows/ur-build-offload.yml
index 9dafaa6decd0c..bcfc9e19fa5fd 100644
--- a/.github/workflows/ur-build-offload.yml
+++ b/.github/workflows/ur-build-offload.yml
@@ -13,7 +13,7 @@ jobs:
         build_type: [Release]
         compiler: [{c: gcc, cxx: g++}]
 
-    runs-on: [ "Linux", "build" ]
+    runs-on: [ "Linux", "build-test" ]
     container:
       image: 'ghcr.io/intel/llvm/ubuntu2404_build'