--- a/taskcluster/ci/legacy/tasks/builds/linux64_clang.yml
+++ b/taskcluster/ci/legacy/tasks/builds/linux64_clang.yml
@@ -1,52 +1,59 @@
 $inherits:
-  from: 'tasks/builds/firefox_docker_base.yml'
+  from: 'tasks/build.yml'
   variables:
+    build_product: firefox
     build_name: 'linux64-clang'
     build_type: 'opt'
+
+docker-image: desktop-build
 task:
   metadata:
     name: '[TC] Clang'
     description: 'Clang'
 
   workerType: 'gecko-{{level}}-b-linux'
 
-  routes:
-    - 'index.buildbot.branches.{{project}}.clang'
-    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.clang'
-
   scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
     - 'docker-worker:cache:tooltool-cache'
 
   payload:
+    image:
+      type: 'task-image'
+      path: 'public/image.tar'
+      taskId:
+        task-reference: "<docker-image>"
+
     cache:
+      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
       tooltool-cache: '/home/worker/tooltool-cache'
 
     env:
-      MOZHARNESS_DISABLE: 'true'
       TOOLS_DISABLE: 'true'
       TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
 
     maxRunTime: 36000
 
     command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/taskcluster/scripts/misc/build-clang-linux.sh" ]
 
     artifacts:
-      'public/clang.tar.xz':
-        type: file
-        path: '/home/worker/workspace/artifacts/clang.tar.xz'
+      'public':
+        type: directory
+        path: '/home/worker/workspace/artifacts/'
         expires:
           relative-datestamp: "1 year"
 
   extra:
     treeherderEnv:
       - staging
       - production
     treeherder:
       groupSymbol: Cc
       groupName: Compilers, submitted by taskcluster
       symbol: Clang
+      tier: 1
       machine:
         platform: linux64
     locations:
         build: null
         tests: null

--- a/taskcluster/ci/legacy/tasks/builds/linux64_gcc.yml
+++ b/taskcluster/ci/legacy/tasks/builds/linux64_gcc.yml
@@ -1,45 +1,59 @@
 $inherits:
-  from: 'tasks/builds/firefox_docker_base.yml'
+  from: 'tasks/build.yml'
   variables:
+    build_product: firefox
     build_name: 'linux64-gcc'
     build_type: 'opt'
+
+docker-image: desktop-build
 task:
   metadata:
     name: '[TC] GCC'
     description: 'GCC'
 
   workerType: 'gecko-{{level}}-b-linux'
 
-  routes:
-    - 'index.buildbot.branches.{{project}}.gcc'
-    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.gcc'
+  scopes:
+    - 'docker-worker:cache:level-{{level}}-{{project}}-tc-vcs'
+    - 'docker-worker:cache:tooltool-cache'
 
   payload:
+    image:
+      type: 'task-image'
+      path: 'public/image.tar'
+      taskId:
+        task-reference: "<docker-image>"
+
+    cache:
+      level-{{level}}-{{project}}-tc-vcs: '/home/worker/.tc-vcs'
+      tooltool-cache: '/home/worker/tooltool-cache'
+
     env:
-      MOZHARNESS_DISABLE: 'true'
       TOOLS_DISABLE: 'true'
+      TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
 
     maxRunTime: 36000
 
     command: ["/bin/bash", "-c", "cd /home/worker/ && ./bin/checkout-sources.sh && ./workspace/build/src/taskcluster/scripts/misc/build-gcc-linux.sh" ]
 
     artifacts:
-      'public/gcc.tar.xz':
-        type: file
-        path: '/home/worker/workspace/artifacts/gcc.tar.xz'
+      'public':
+        type: directory
+        path: '/home/worker/workspace/artifacts/'
         expires:
           relative-datestamp: "1 year"
 
   extra:
     treeherderEnv:
       - staging
       - production
     treeherder:
       groupSymbol: Cc
       groupName: Compilers, submitted by taskcluster
       symbol: GCC
+      tier: 1
       machine:
         platform: linux64
     locations:
         build: null
         tests: null