diff --git a/share/spack/gitlab/cloud_pipelines/stacks/gpu-tests/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/gpu-tests/spack.yaml
index e613c82919..a0d17622d3 100644
--- a/share/spack/gitlab/cloud_pipelines/stacks/gpu-tests/spack.yaml
+++ b/share/spack/gitlab/cloud_pipelines/stacks/gpu-tests/spack.yaml
@@ -61,14 +61,18 @@ spack:
       submapping:
       - match:
         - kokkos +rocm amdgpu_target=gfx90a
+        build-job-remove:
+          tags: [ "x86_64" ]
         build-job:
-          tags: [ "rocm-5.4.0", "mi210" ]
+          tags: [ "x86_64-rocm", "rocm-5.4.0", "mi210" ]
 
       - match:
         - kokkos +cuda cuda_arch=80 ^cuda@12.0.0
         - raja +cuda cuda_arch=80 ^cuda@12.0.0
+        build-job-remove:
+          tags: [ "x86_64" ]
         build-job:
-          tags: [ "nvidia-525.85.12", "cuda-12.0", "a100" ]
+          tags: [ "x86_64-cuda", "nvidia-525.85.12", "cuda-12.0", "a100" ]
 
   cdash:
     build-group: GPU Testing