diff --git a/.gitlab/ci/centos7.yml b/.gitlab/ci/centos7.yml
index 7fb803fee..03559a06a 100644
--- a/.gitlab/ci/centos7.yml
+++ b/.gitlab/ci/centos7.yml
@@ -6,7 +6,7 @@ build:centos7_gcc73:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - large-memory
   extends:
     - .centos7
@@ -23,7 +23,7 @@ test:centos7_gcc73:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - cuda-rt
     - turing
   extends:
@@ -41,7 +41,7 @@ test:rhel8_test_centos7:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - cuda-rt
     - turing
   extends:
diff --git a/.gitlab/ci/centos8.yml b/.gitlab/ci/centos8.yml
index 70d3f74e0..ca7643a7d 100644
--- a/.gitlab/ci/centos8.yml
+++ b/.gitlab/ci/centos8.yml
@@ -6,7 +6,7 @@ build:centos8_sanitizer:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .centos8
     - .cmake_build_linux
@@ -21,7 +21,7 @@ test:centos8_sanitizer:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - privileged
   extends:
     - .centos8
diff --git a/.gitlab/ci/doxygen.yml b/.gitlab/ci/doxygen.yml
index d5312be15..b8a6271dc 100644
--- a/.gitlab/ci/doxygen.yml
+++ b/.gitlab/ci/doxygen.yml
@@ -1,9 +1,10 @@
 .doxygen_submit: &doxygen_submit
   stage: build
   tags:
+    - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   before_script:
     - "cmake -V -P .gitlab/ci/config/gitlab_ci_setup.cmake"
     - "ctest -VV -S .gitlab/ci/ctest_configure.cmake"
diff --git a/.gitlab/ci/macos.yml b/.gitlab/ci/macos.yml
index 5bd8c62ec..6f2a53b09 100644
--- a/.gitlab/ci/macos.yml
+++ b/.gitlab/ci/macos.yml
@@ -79,6 +79,6 @@ test:macos_xcode13:
 .macos_build_tags:
   tags:
     - vtk-m
-    - macos
+    - macos-x86_64
     - xcode-13.3
     - nonconcurrent
diff --git a/.gitlab/ci/rhel8.yml b/.gitlab/ci/rhel8.yml
index c17398b9c..5908aa322 100644
--- a/.gitlab/ci/rhel8.yml
+++ b/.gitlab/ci/rhel8.yml
@@ -6,7 +6,7 @@ build:rhel8:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .rhel8
     - .cmake_build_linux
@@ -20,7 +20,7 @@ test:rhel8:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .rhel8
     - .cmake_test_linux
@@ -37,7 +37,7 @@ build:rhel8_vtk_types:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .rhel8
     - .cmake_build_linux
@@ -51,7 +51,7 @@ test:rhel8_vtk_types:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .rhel8
     - .cmake_test_linux
diff --git a/.gitlab/ci/ubuntu1604.yml b/.gitlab/ci/ubuntu1604.yml
index 2f5ff5a3a..6baba14aa 100644
--- a/.gitlab/ci/ubuntu1604.yml
+++ b/.gitlab/ci/ubuntu1604.yml
@@ -6,7 +6,7 @@ build:ubuntu1604_gcc5:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - large-memory
   extends:
     - .ubuntu1604_cuda
@@ -24,7 +24,7 @@ test:ubuntu1604_gcc5:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - cuda-rt
     - pascal
   extends:
@@ -44,7 +44,7 @@ build:ubuntu1604_gcc5_2:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - large-memory
   extends:
     - .ubuntu1604_cuda
@@ -62,7 +62,7 @@ test:ubuntu1804_test_ubuntu1604_gcc5_2:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - cuda-rt
     - pascal
   extends:
@@ -84,7 +84,7 @@ build:ubuntu1604_clang5:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu1604
     - .cmake_build_linux
@@ -101,7 +101,7 @@ test:ubuntu1604_clang5:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu1604
     - .cmake_test_linux
diff --git a/.gitlab/ci/ubuntu1804.yml b/.gitlab/ci/ubuntu1804.yml
index ef9f14e01..f99dbce07 100644
--- a/.gitlab/ci/ubuntu1804.yml
+++ b/.gitlab/ci/ubuntu1804.yml
@@ -7,7 +7,7 @@ build:ubuntu1804_gcc9:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu1804
     - .cmake_build_linux
@@ -23,7 +23,7 @@ test:ubuntu1804_gcc9:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu1804
     - .cmake_test_linux
@@ -45,7 +45,7 @@ build:ubuntu1804_gcc7:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - large-memory
   extends:
     - .ubuntu1804_cuda
@@ -62,7 +62,7 @@ test:ubuntu1804_gcc7:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - cuda-rt
     - turing
   extends:
@@ -83,7 +83,7 @@ build:ubuntu1804_clang_cuda:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - large-memory
   extends:
     - .ubuntu1804_cuda
@@ -101,7 +101,7 @@ test:ubuntu1804_clang_cuda:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - cuda-rt
     - pascal
   extends:
@@ -121,7 +121,7 @@ build:ubuntu1804_gcc6:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu1804
     - .cmake_build_linux
@@ -136,7 +136,7 @@ test:ubuntu1804_gcc6:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu1804
     - .cmake_test_linux
@@ -157,7 +157,7 @@ build:ubuntu1804_clang8:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu1804
     - .cmake_build_linux
@@ -173,7 +173,7 @@ test:ubuntu1804_clang8:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu1804
     - .cmake_test_linux
@@ -190,7 +190,7 @@ build:ubuntu1804_kokkos:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - large-memory
   extends:
     - .ubuntu1804_cuda_kokkos
@@ -206,7 +206,7 @@ test:ubuntu1804_kokkos:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
     - cuda-rt
     - turing
   extends:
@@ -223,7 +223,7 @@ build:ubuntu1804_cuda_perftest:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu1804_cuda
     - .cmake_build_linux
@@ -238,7 +238,7 @@ test:ubuntu1804_cuda_perftest:
     - vtkm
     - docker
     - cuda-rt
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu1804_cuda
     - .cmake_test_linux
diff --git a/.gitlab/ci/ubuntu2004.yml b/.gitlab/ci/ubuntu2004.yml
index ca104cab2..108cdb8be 100644
--- a/.gitlab/ci/ubuntu2004.yml
+++ b/.gitlab/ci/ubuntu2004.yml
@@ -3,7 +3,7 @@ build:ubuntu2004_gcc9:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu2004
     - .cmake_build_linux
@@ -17,7 +17,7 @@ test:ubuntu2004_gcc9:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu2004
     - .cmake_test_linux
@@ -36,7 +36,7 @@ build:ubuntu2004_kokkos:
     - build
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu2004_kokkos
     - .cmake_build_linux
@@ -50,7 +50,7 @@ test:ubuntu2004_kokkos:
     - test
     - vtkm
     - docker
-    - linux
+    - linux-x86_64
   extends:
     - .ubuntu2004_kokkos
     - .cmake_test_linux
@@ -65,6 +65,7 @@ build:ubuntu2004_hip_kokkos:
     - build
     - vtkm
     - docker
+    - linux-x86_64
     - radeon
   extends:
     - .ubuntu2004_hip_kokkos
@@ -95,6 +96,7 @@ test:ubuntu2004_hip_kokkos:
     - build
     - vtkm
     - docker
+    - linux-x86_64
     - radeon
   extends:
     - .ubuntu2004_hip_kokkos
diff --git a/.gitlab/ci/windows10.yml b/.gitlab/ci/windows10.yml
index f33cbb509..a1e926cc7 100644
--- a/.gitlab/ci/windows10.yml
+++ b/.gitlab/ci/windows10.yml
@@ -90,7 +90,7 @@ build:windows_vs2019:
     - vtkm # Since this is a bare runner, pin to a project.
     - nonconcurrent
     - build
-    - windows
+    - windows-x86_64
     - shell
     - vs2019
     - msvc-19.25
@@ -110,7 +110,7 @@ test:windows_vs2019:
     - vtkm # Since this is a bare runner, pin to a project.
     - nonconcurrent
     - test
-    - windows
+    - windows-x86_64
     - shell
     - vs2019
     - msvc-19.25