diff --git a/taskcluster/ci/test/compiled.yml b/taskcluster/ci/test/compiled.yml
index bb24f8fb9f56..046d60c4deb6 100644
--- a/taskcluster/ci/test/compiled.yml
+++ b/taskcluster/ci/test/compiled.yml
@@ -69,7 +69,7 @@ gtest:
             windows10-64-pgo.*: 3
             windows10-64-asan.*: 3
             windows10-aarch64.*: 2
-            linux64-ccov/opt: 3
+            linux.*64-ccov/opt: 3
             default: default
 
 jittest:
diff --git a/taskcluster/ci/test/misc.yml b/taskcluster/ci/test/misc.yml
index 8215ff29a9cf..78fcbc5d9eb6 100644
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -48,7 +48,7 @@ test-verify:
             # do not run on ccov
             .*-ccov/.*: []
             .*-asan/.*: []
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
+            (?:windows10-64|windows7-32|linux1804-64)(?:-qr)?/opt: ['mozilla-central', 'try']
             macosx.*64(?:-qr)?/opt: ['mozilla-central', 'try']
             # do not run on beta or release: usually just confirms earlier results
             default: ['trunk', 'try']
@@ -105,7 +105,7 @@ test-verify-gpu:
             # do not run on ccov
             .*-ccov/.*: []
             .*-asan/.*: []
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
+            (?:windows10-64|windows7-32|linux1804-64)(?:-qr)?/opt: ['mozilla-central', 'try']
             macosx.*64(?:-qr)?/opt: ['mozilla-central', 'try']
             # do not run on beta or release: usually just confirms earlier results
             default: ['trunk', 'try']
diff --git a/taskcluster/ci/test/mochitest.yml b/taskcluster/ci/test/mochitest.yml
index 52453a73ab8f..a674e43feef2 100644
--- a/taskcluster/ci/test/mochitest.yml
+++ b/taskcluster/ci/test/mochitest.yml
@@ -12,7 +12,7 @@ job-defaults:
             default: null
     variants:
         by-test-platform:
-            linux64/debug: ['fission', 'serviceworker']
+            linux.*64/debug: ['fission', 'serviceworker']
             default: ['fission']
     run-on-projects:
         by-test-platform:
@@ -20,14 +20,14 @@ job-defaults:
             default: built-projects
     fission-run-on-projects:
         by-test-platform:
-            linux64-qr/debug: ['trunk']
-            linux64-qr/opt: ['mozilla-central']
-            linux64/.*: ['mozilla-central']
+            linux.*64-qr/debug: ['trunk']
+            linux.*64-qr/opt: ['mozilla-central']
+            linux.*64/.*: ['mozilla-central']
             windows10-64(-qr)?/opt: ['mozilla-central']
             default: []
     fission-tier:
         by-test-platform:
-            linux64.*-qr/debug: 1
+            linux.*64.*-qr/debug: 1
             default: 2
     mozharness:
         script:
@@ -60,14 +60,14 @@ mochitest:
     tier:
         by-test-platform:
             windows10-aarch64.*: 2
-            linux64-ccov/opt: 3
+            linux.*64-ccov/opt: 3
             default: default
     chunks:
         by-test-platform:
             android-em-7.*: 4
             linux.*/debug: 16
-            linux64-asan/opt: 10
-            linux64-.*cov/opt: 10
+            linux.*64-asan/opt: 10
+            linux.*64-.*cov/opt: 10
             windows10-64-ccov/.*: 10
             macosx.*64-ccov/.*: 10
             default: 5
@@ -110,31 +110,30 @@ mochitest-browser-chrome:
     loopback-video: true
     fission-run-on-projects:
         by-test-platform:
-            linux64(-qr)?/debug: ['trunk']
-            linux64(-qr)?/opt: ['mozilla-central']
+            linux.*64(-qr)?/debug: ['trunk']
+            linux.*64(-qr)?/opt: ['mozilla-central']
             windows10-64(-qr)?/opt: ['mozilla-central']
             default: []
     tier:
         by-test-platform:
             windows10-aarch64.*: 2
-            linux64-ccov/opt: 3
+            linux.*64-ccov/opt: 3
             default: default
     fission-tier:
         by-test-platform:
-            linux64/debug: 1
+            linux.*64/debug: 1
             default: 2
     chunks:
         by-test-platform:
             linux.*/debug: 16
-            linux64-asan/opt: 16
+            linux.*64-asan/opt: 16
             macosx.*64/debug: 16
             windows10-64-ccov/.*: 14
             windows10.*-asan/opt: 9
             default: 7
     max-run-time:
         by-test-platform:
-            linux64-ccov/debug: 9000
-            linux64-ccov/opt: 9000
+            linux.*64-ccov/.*: 9000
             windows7-32/debug: 5400
             windows10-64/debug: 5400
             windows10-64-ccov/.*: 10800
@@ -184,7 +183,7 @@ mochitest-chrome:
             .*-ccov/.*: 3
             .*-qr/.*: 3
             .*-asan/opt: 3
-            (linux64|windows.*-..|macosx10..)/debug: 3
+            (linux.*64|windows.*-..|macosx10..)/debug: 3
             windows10-aarch64/.*: 3
             default: 2
     max-run-time: 3600
@@ -202,18 +201,18 @@ mochitest-devtools-chrome:
     tier:
         by-test-platform:
             windows10-aarch64.*: 2
-            linux64-ccov/opt: 3
+            linux.*64-ccov/opt: 3
             default: default
     max-run-time:
         by-test-platform:
             windows10-64-ccov/.*: 10800
             macosx.*64-ccov/.*: 9000
-            linux64-ccov/.*: 7200
+            linux.*64-ccov/.*: 7200
             default: 5400
     chunks:
         by-test-platform:
             .*-ccov/.*: 16
-            linux64/debug: 12
+            linux.*64/debug: 12
             macosx.*64/debug: 8
             .*-asan/opt: 8
             default: 5
@@ -222,7 +221,7 @@ mochitest-devtools-chrome:
         chunked: true
     instance-size:
         by-test-platform:
-            linux64-asan/opt: xlarge  # runs out of memory on default/m3.large
+            linux.*64-asan/opt: xlarge  # runs out of memory on default/m3.large
             default: default
     # Bug 1296086: high number of intermittents observed with software GL and large instances
     allow-software-gl-layers: false
diff --git a/taskcluster/ci/test/reftest.yml b/taskcluster/ci/test/reftest.yml
index 803bafe2b55e..a92cb3145bc3 100644
--- a/taskcluster/ci/test/reftest.yml
+++ b/taskcluster/ci/test/reftest.yml
@@ -12,7 +12,7 @@ job-defaults:
             default: null
     variants:
         by-test-platform:
-            linux64/debug: ['fission', 'serviceworker']
+            linux1804-64/debug: ['fission', 'serviceworker']
             default: ['fission']
     fission-tier: 2
     run-on-projects:
@@ -71,10 +71,10 @@ jsreftest:
             windows10-64-asan/opt: 3
             windows10-64-ccov/debug: 5
             windows10-64-ccov/opt: 5
-            linux64-ccov/.*: 5
-            linux64-qr/opt: 4
-            linux64-qr/debug: 5
-            linux64/debug: 5
+            linux.*64-ccov/.*: 5
+            linux1804-64-qr/opt: 4
+            linux1804-64-qr/debug: 5
+            linux1804-64/debug: 5
             macosx.*-64-ccov/.*: 5
             macosx.*-64(-shippable)?/opt: 2
             default: 3
@@ -101,7 +101,7 @@ reftest:
     chunks:
         by-test-platform:
             android-em-7.*: 2
-            linux64(-shippable|-devedition|-qr)?/opt: 5
+            linux1804-64(-shippable|-devedition|-qr)?/opt: 5
             macosx101.*-64-shippable(-qr)?/opt: 3
             macosx101.*-64/debug: 4
             macosx101.*-64(-ccov|-qr)/debug: 6
@@ -133,11 +133,11 @@ reftest:
             default: default
     fission-tier:
         by-test-platform:
-            linux64-qr/debug: 1
+            linux1804-64-qr/debug: 1
             default: 2
     fission-run-on-projects:
         by-test-platform:
-            linux64-qr/debug: ['trunk']
+            linux1804-64-qr/debug: ['trunk']
             default: []
 
 reftest-gpu:
@@ -170,7 +170,7 @@ reftest-no-accel:
         by-test-platform:
             macosx.*: 1
             windows.*: 4
-            linux64(-shippable|-devedition)?/opt: 4
+            linux1804-64(-shippable|-devedition)?/opt: 4
             default: 8
     mozharness:
         chunked:
diff --git a/taskcluster/ci/test/web-platform.yml b/taskcluster/ci/test/web-platform.yml
index ba17ced4f434..60fe7623f840 100644
--- a/taskcluster/ci/test/web-platform.yml
+++ b/taskcluster/ci/test/web-platform.yml
@@ -12,12 +12,12 @@ job-defaults:
             default: 5400
     variants:
         by-test-platform:
-            linux64/debug: ['fission', 'serviceworker']
+            linux.*64/debug: ['fission', 'serviceworker']
             default: ['fission']
     fission-run-on-projects:
         by-test-platform:
-            linux64-qr/debug: ['trunk']
-            linux64-qr/opt: ['mozilla-central']
+            linux.*64-qr/debug: ['trunk']
+            linux.*64-qr/opt: ['mozilla-central']
             windows10-64-qr/opt: ['mozilla-central']
             default: []
     fission-tier: 2
@@ -48,9 +48,9 @@ web-platform-tests:
     chunks:
         by-test-platform:
             android.*: 18
-            linux64-asan/opt: 24
-            linux64-ccov/debug: 24
-            linux64-ccov/opt: 24
+            linux.*64-asan/opt: 24
+            linux.*64-ccov/debug: 24
+            linux.*64-ccov/opt: 24
             linux.*/debug: 18
             macosx*/opt: 8
             macosx.*/debug: 16
@@ -61,7 +61,7 @@ web-platform-tests:
     max-run-time:
         by-test-platform:
             .*-ccov/.*: 10800
-            linux64-qr/debug: 9000
+            linux.*64-qr/debug: 9000
             default: 7200
     e10s: true
     run-on-projects:
@@ -72,10 +72,10 @@ web-platform-tests:
             default: built-projects
     tier:
         by-test-platform:
-            linux64-asan/opt: 2
+            linux.*64-asan/opt: 2
             windows10-aarch64.*: 2
             .*-qr/.*: 2  # can't be tier-1 if it's not running on integration branches
-            linux64-ccov/opt: 3
+            linux.*64-ccov/opt: 3
             default: default
     mozharness:
         chunked: true
@@ -136,9 +136,9 @@ web-platform-tests-wdspec:
     tier:
         by-test-platform:
             android.*: 3
-            linux64-asan/opt: 2
+            linux.*64-asan/opt: 2
             .*-qr/.*: 2  # can't be tier-1 if it's not running on integration branches
-            linux64-ccov/opt: 3
+            linux.*64-ccov/opt: 3
             default: default
 
 web-platform-tests-wdspec-headless:
@@ -181,7 +181,7 @@ web-platform-tests-crashtests:
             linux1804-64-asan/opt: 2
             windows10-aarch64.*: 2
             .*-qr/.*: 2  # can't be tier-1 if it's not running on integration branches
-            linux64-ccov/opt: 3
+            linux.*64-ccov/opt: 3
             default: default
 
 test-verify-wpt:
@@ -198,7 +198,7 @@ test-verify-wpt:
             # do not run on ccov
             .*-ccov/.*: []
             .*-asan/.*: []
-            (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
+            (?:windows10-64|windows7-32|linux.*64)(?:-qr)?/opt: ['mozilla-central', 'try']
             macosx.*64(?:-qr)?/opt: ['mozilla-central', 'try']
             # do not run on beta or release: usually just confirms earlier results
             default: ['trunk', 'try']
diff --git a/taskcluster/ci/test/xpcshell.yml b/taskcluster/ci/test/xpcshell.yml
index 47c6ff1c4055..e33815096151 100644
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -69,7 +69,7 @@ xpcshell:
         by-test-platform:
             windows10-64-asan.*: 3
             windows10-aarch64.*: 2
-            linux64-ccov/opt: 3
+            linux.*64-ccov/opt: 3
             default: default
     fetches:
         toolchain: