diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml
index 84950d25c7..f6892c9b3d 100644
--- a/.gitlab/os-linux.yml
+++ b/.gitlab/os-linux.yml
@@ -354,21 +354,21 @@
         - cmake
         - build
         - docker
-        - linux
+        - linux-x86_64
 
 .linux_builder_tags_qt:
     tags:
         - cmake
         - build
         - docker
-        - linux
+        - linux-x86_64
         - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
 
 .linux_builder_tags_x11:
     tags:
         - cmake
         - docker
-        - linux
+        - linux-x86_64
         - linux-3.17 # Needed to be able to load Fedora's Qt libraries.
         - x11
 
@@ -377,14 +377,14 @@
         - cmake
         - cuda-rt
         - docker
-        - linux
+        - linux-x86_64
 
 .linux_builder_tags_radeon:
     tags:
         - cmake
         - radeon
         - docker
-        - linux
+        - linux-x86_64
 
 .linux_builder_tags_aarch64:
     tags:
diff --git a/.gitlab/os-macos.yml b/.gitlab/os-macos.yml
index 82bcf01e89..25af8eb211 100644
--- a/.gitlab/os-macos.yml
+++ b/.gitlab/os-macos.yml
@@ -93,7 +93,7 @@
 .macos_x86_64_builder_tags:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - macos
+        - macos-x86_64
         - shell
         - xcode-14.1
         - nonconcurrent
@@ -101,7 +101,7 @@
 .macos_x86_64_builder_tags_package:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - macos
+        - macos-x86_64
         - shell
         - xcode-14.1
         - nonconcurrent
@@ -110,7 +110,7 @@
 .macos_x86_64_builder_ext_tags:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - macos
+        - macos-x86_64
         - shell
         - xcode-14.1
         - concurrent
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index eeed6405a8..edd61368bc 100644
--- a/.gitlab/os-windows.yml
+++ b/.gitlab/os-windows.yml
@@ -229,7 +229,7 @@
 .windows_tags_nonconcurrent_vs2022:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - vs2022
         - msvc-19.34
@@ -238,7 +238,7 @@
 .windows_tags_nonconcurrent_vs2022_arm64:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - vs2022
         - msvc-19.34-arm64
@@ -247,7 +247,7 @@
 .windows_tags_concurrent_vs2022:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - vs2022
         - msvc-19.34
@@ -256,7 +256,7 @@
 .windows_tags_concurrent_vs2019:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - vs2019
         - msvc-19.29-16.11
@@ -265,7 +265,7 @@
 .windows_tags_concurrent:
     tags:
         - cmake # Since this is a bare runner, pin to a project.
-        - windows
+        - windows-x86_64
         - shell
         - concurrent
 
diff --git a/.gitlab/upload.yml b/.gitlab/upload.yml
index 38d40a992f..f4a7c44c79 100644
--- a/.gitlab/upload.yml
+++ b/.gitlab/upload.yml
@@ -6,7 +6,7 @@
     tags:
         - cmake
         - docker
-        - linux
+        - linux-x86_64
         - build
     environment:
         name: rsync-upload
@@ -25,7 +25,7 @@
     tags:
         - cmake
         - docker
-        - linux
+        - linux-x86_64
         - build
     environment:
         name: rsync-upload