--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -25,17 +25,16 @@ android-api-15/debug:
 android-x86/opt:
     description: "Android 4.2 x86 Opt"
     index:
         product: mobile
         job-name: android-x86-opt
     treeherder:
         platform: android-4-2-x86/opt
         symbol: tc(B)
-        tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         implementation: docker-worker
         max-run-time: 7200
     run:
         using: mozharness
         actions: [get-secrets build generate-build-stats multi-l10n update]
         config:
@@ -53,17 +52,16 @@ android-x86-nightly/opt:
         nightly: true
     index:
         product: mobile
         job-name: android-x86-opt
         type: nightly
     treeherder:
         platform: android-4-2-x86/opt
         symbol: tc(N)
-        tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         implementation: docker-worker
         max-run-time: 7200
     run:
         using: mozharness
         actions: [get-secrets build multi-l10n update]
         config:
@@ -80,17 +78,16 @@ android-x86-nightly/opt:
 android-api-15/opt:
     description: "Android 4.0 API15+ Opt"
     index:
         product: mobile
         job-name: android-api-15-opt
     treeherder:
         platform: android-4-0-armv7-api15/opt
         symbol: tc(B)
-        tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         implementation: docker-worker
         max-run-time: 7200
     run:
         using: mozharness
         actions: [get-secrets build generate-build-stats multi-l10n update]
         config:
@@ -108,17 +105,16 @@ android-api-15-nightly/opt:
         nightly: true
     index:
         product: mobile
         job-name: android-api-15-opt
         type: nightly
     treeherder:
         platform: android-4-0-armv7-api15/opt
         symbol: tc(N)
-        tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-android
     worker:
         implementation: docker-worker
         max-run-time: 7200
     run:
         using: mozharness
         actions: [get-secrets build generate-build-stats multi-l10n update]
         config:

--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -1,17 +1,16 @@
 linux64/opt:
     description: "Linux64 Opt"
     index:
         product: firefox
         job-name: linux64-opt
     treeherder:
         platform: linux64/opt
         symbol: tc(B)
-        tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         implementation: docker-worker
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test generate-build-stats update]
         config:
@@ -25,17 +24,16 @@ linux64/opt:
 linux64/pgo:
     description: "Linux64 PGO"
     index:
         product: firefox
         job-name: linux64-pgo
     treeherder:
         platform: linux64/pgo
         symbol: tc(B)
-        tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         implementation: docker-worker
         max-run-time: 36000
     coalesce-name: linux64-pgo
     run:
         using: mozharness
         actions: [get-secrets build check-test generate-build-stats update]
@@ -75,17 +73,16 @@ linux64/debug:
 linux/opt:
     description: "Linux32 Opt"
     index:
         product: firefox
         job-name: linux-opt
     treeherder:
         platform: linux32/opt
         symbol: tc(B)
-        tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         implementation: docker-worker
         max-run-time: 36000
     coalesce-name: opt_linux32
     run:
         using: mozharness
         actions: [get-secrets build check-test generate-build-stats update]
@@ -100,17 +97,16 @@ linux/opt:
 linux/debug:
     description: "Linux32 Debug"
     index:
         product: firefox
         job-name: linux-debug
     treeherder:
         platform: linux32/debug
         symbol: tc(B)
-        tier: 1
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         implementation: docker-worker
         max-run-time: 36000
     coalesce-name: dbg_linux32
     run:
         using: mozharness
         actions: [get-secrets build check-test generate-build-stats update]
@@ -126,17 +122,16 @@ linux/debug:
 linux/pgo:
     description: "Linux32 PGO"
     index:
         product: firefox
         job-name: linux-pgo
     treeherder:
         platform: linux32/pgo
         symbol: tc(B)
-        tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         implementation: docker-worker
         max-run-time: 36000
     coalesce-name: linux32-pgo
     run:
         using: mozharness
         actions: [get-secrets build check-test generate-build-stats update]
@@ -155,17 +150,16 @@ linux-nightly/opt:
         nightly: true
     index:
         product: firefox
         job-name: linux-opt
         type: nightly
     treeherder:
         platform: linux32/opt
         symbol: tc(N)
-        tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         implementation: docker-worker
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test generate-build-stats update]
         config:
@@ -233,17 +227,16 @@ linux64-nightly/opt:
         nightly: true
     index:
         product: firefox
         job-name: linux64-opt
         type: nightly
     treeherder:
         platform: linux64/opt
         symbol: tc(N)
-        tier: 2
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         implementation: docker-worker
         max-run-time: 36000
     run:
         using: mozharness
         actions: [get-secrets build check-test generate-build-stats update]
         config: