--- a/taskcluster/ci/legacy/tasks/builds/haz_linux.yml
+++ b/taskcluster/ci/legacy/tasks/builds/haz_linux.yml
@@ -13,24 +13,24 @@ task:
   scopes:
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
     - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-haz-workspace'
 
   payload:
     cache:
       level-{{level}}-{{project}}-build-linux64-haz-workspace: '/home/worker/workspace'
-      tooltool-cache: '/home/worker/tools/tooltool-cache'
+      tooltool-cache: '/home/worker/tooltool-cache'
 
     features:
       relengAPIProxy: true
 
     env:
       MOZCONFIG: 'browser/config/mozconfigs/linux64/hazards'
-      TOOLTOOL_CACHE: '/home/worker/tools/tooltool-cache'
+      TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
       TOOLTOOL_MANIFEST: 'browser/config/tooltool-manifests/linux64/hazard.manifest'
 
     maxRunTime: 36000
 
     command:
       - /bin/bash
       - -c
       - >

--- a/taskcluster/ci/legacy/tasks/builds/haz_shell_linux.yml
+++ b/taskcluster/ci/legacy/tasks/builds/haz_shell_linux.yml
@@ -13,23 +13,23 @@ task:
   scopes:
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
     - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-haz-workspace'
 
   payload:
     cache:
       level-{{level}}-{{project}}-build-linux64-haz-workspace: '/home/worker/workspace'
-      tooltool-cache: '/home/worker/tools/tooltool-cache'
+      tooltool-cache: '/home/worker/tooltool-cache'
 
     features:
       relengAPIProxy: true
 
     env:
-      TOOLTOOL_CACHE: '/home/worker/tools/tooltool-cache'
+      TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
       TOOLTOOL_MANIFEST: 'browser/config/tooltool-manifests/linux64/hazard.manifest'
 
     maxRunTime: 36000
 
     command:
       - /bin/bash
       - -c
       - >

--- a/taskcluster/ci/legacy/tasks/builds/mulet_haz_linux.yml
+++ b/taskcluster/ci/legacy/tasks/builds/mulet_haz_linux.yml
@@ -17,24 +17,25 @@ task:
   scopes:
     - 'docker-worker:cache:level-{{level}}-{{project}}-build-mulet-haz-linux-workspace'
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
     cache:
       level-{{level}}-{{project}}-build-mulet-haz-linux-workspace: '/home/worker/workspace'
-      tooltool-cache: '/home/worker/tools/tooltool-cache'
+      tooltool-cache: '/home/worker/tooltool-cache'
 
     features:
       relengAPIProxy: true
 
     env:
       MOZCONFIG: 'b2g/dev/config/mozconfigs/linux64/mulet-hazards'
       TOOLTOOL_MANIFEST: 'gecko/b2g/dev/config/tooltool-manifests/linux64/hazard.manifest'
+      TOOLTOOL_CACHE: '/home/worker/tooltool-cache'
 
     maxRunTime: 36000
 
     command:
       - /bin/bash
       - -c
       - >
         checkout-gecko workspace &&