diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index 53c79fb24c5..0d51e1bfe7f 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -405,7 +405,7 @@ python-test:
     reports:
       junit: results/**/junit.xml
 
-.b2c-test-vk:
+.b2c-x86_64-test-vk:
   extends:
     - .use-debian/x86_64_test-vk
     - .b2c-test
@@ -414,7 +414,7 @@ python-test:
     - debian-testing
     - !reference [.required-for-hardware-jobs, needs]
 
-.b2c-test-gl:
+.b2c-x86_64-test-gl:
   extends:
     - .use-debian/x86_64_test-gl
     - .b2c-test
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index 1e72babb28e..4f2ebdbbf64 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -242,7 +242,7 @@
   extends:
     - .radv-valve-rules
     - .test-radv
-    - .b2c-test-vk
+    - .b2c-x86_64-test-vk
   variables:
     B2C_KERNEL_URL: https://fs.mupuf.org/linux-6.6-b2c-radv-ci # 6.6
 
diff --git a/src/amd/ci/gitlab-ci.yml b/src/amd/ci/gitlab-ci.yml
index e754ddd4c9d..32529d9219c 100644
--- a/src/amd/ci/gitlab-ci.yml
+++ b/src/amd/ci/gitlab-ci.yml
@@ -263,7 +263,7 @@ vkcts-vangogh-valve:
 
 glcts-vangogh-valve:
   extends:
-    - .b2c-test-gl
+    - .b2c-x86_64-test-gl
     - .deqp-test-valve
     - .vangogh-test-valve
     - .radeonsi-valve-manual-rules
diff --git a/src/gallium/drivers/r300/ci/gitlab-ci.yml b/src/gallium/drivers/r300/ci/gitlab-ci.yml
index 7ea23e754b3..e43abe2c7ee 100644
--- a/src/gallium/drivers/r300/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/r300/ci/gitlab-ci.yml
@@ -3,7 +3,7 @@ include:
 
 .ondracka-rv530:
   extends:
-    - .b2c-test-gl
+    - .b2c-x86_64-test-gl
     - .r300-manual-rules
   tags:
     - radeon:codename:RV530
@@ -15,7 +15,7 @@ include:
 
 .ondracka-rv380:
   extends:
-    - .b2c-test-gl
+    - .b2c-x86_64-test-gl
     - .r300-manual-rules
   tags:
     - radeon:codename:RV380
diff --git a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
index 3730a08a65d..dd4fc5166ca 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml
@@ -159,7 +159,7 @@
   extends:
     - .zink-test
     - .test-radv
-    - .b2c-test-gl
+    - .b2c-x86_64-test-gl
   variables:
     DEQP_SUITE: zink-radv
     HWCI_TEST_SCRIPT: ./install/deqp-runner.sh