--- a/taskcluster/ci/legacy/tasks/builds/b2g_aries_debug.yml
+++ b/taskcluster/ci/legacy/tasks/builds/b2g_aries_debug.yml
@@ -1,26 +1,26 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_eng_base.yml'
   variables:
     build_name: 'aries'
     build_type: 'debug'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-debug-objdir-gecko'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-eng-debug'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-eng-debug-objdir-gecko'
     - 'docker-worker:relengapi-proxy:tooltool.download.internal'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
   metadata:
     name: '[TC] B2G Aries Debug'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-aries-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-debug-objdir-gecko: /home/worker/objdir-gecko
+      level-{{level}}-{{project}}-build-aries-eng-debug: /home/worker/workspace
+      level-{{level}}-{{project}}-build-aries-eng-debug-objdir-gecko: /home/worker/objdir-gecko
     features:
       relengAPIProxy: true
     env:
       TARGET: 'aries'
       B2G_DEBUG: 1
   extra:
     treeherderEnv:
       - production

--- a/taskcluster/ci/legacy/tasks/builds/b2g_aries_eng.yml
+++ b/taskcluster/ci/legacy/tasks/builds/b2g_aries_eng.yml
@@ -1,26 +1,26 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_eng_base.yml'
   variables:
     build_name: 'aries-eng'
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-eng'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-eng-objdir-gecko'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-eng-opt'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-aries-eng-opt-objdir-gecko'
     - 'docker-worker:relengapi-proxy:tooltool.download.internal'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
   metadata:
     name: '[TC] B2G Aries Eng'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-aries-eng: /home/worker/workspace
-      level-{{level}}-{{project}}-build-aries-eng-objdir-gecko: /home/worker/objdir-gecko
+      level-{{level}}-{{project}}-build-aries-eng-opt: /home/worker/workspace
+      level-{{level}}-{{project}}-build-aries-eng-opt-objdir-gecko: /home/worker/objdir-gecko
     features:
       relengAPIProxy: true
     env:
       TARGET: 'aries'
   extra:
     treeherderEnv:
       - production
       - staging

--- a/taskcluster/ci/legacy/tasks/builds/b2g_nexus_5l_debug.yml
+++ b/taskcluster/ci/legacy/tasks/builds/b2g_nexus_5l_debug.yml
@@ -1,26 +1,26 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_eng_base.yml'
   variables:
     build_name: 'nexus-5-l-eng'
     build_type: 'debug'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5-l-debug'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5-l-debug-objdir-gecko'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5l-eng-debug'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5l-eng-debug-objdir-gecko'
     - 'docker-worker:relengapi-proxy:tooltool.download.internal'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
   metadata:
     name: '[TC] B2G Nexus 5-L Debug'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-nexus-5-l-debug: /home/worker/workspace
-      level-{{level}}-{{project}}-build-nexus-5-l-debug-objdir-gecko: /home/worker/objdir-gecko
+      level-{{level}}-{{project}}-build-nexus-5l-eng-debug: /home/worker/workspace
+      level-{{level}}-{{project}}-build-nexus-5l-eng-debug-objdir-gecko: /home/worker/objdir-gecko
     features:
       relengAPIProxy: true
     env:
       TARGET: 'nexus-5-l'
       B2G_DEBUG: 1
   extra:
     treeherderEnv:
       - production

--- a/taskcluster/ci/legacy/tasks/builds/b2g_nexus_5l_eng.yml
+++ b/taskcluster/ci/legacy/tasks/builds/b2g_nexus_5l_eng.yml
@@ -1,26 +1,26 @@
 $inherits:
   from: 'tasks/builds/b2g_phone_eng_base.yml'
   variables:
     build_name: 'nexus-5-l-eng'
     build_type: 'opt'
 task:
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5-l-eng'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5-l-eng-objdir-gecko'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5l-eng-opt'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-nexus-5l-eng-opt-objdir-gecko'
     - 'docker-worker:relengapi-proxy:tooltool.download.internal'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
   metadata:
     name: '[TC] B2G Nexus 5-L Eng'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-nexus-5-l-eng: /home/worker/object-folder
-      level-{{level}}-{{project}}-build-nexus-5-l-eng-objdir-gecko: /home/worker/objdir-gecko
+      level-{{level}}-{{project}}-build-nexus-5l-eng-opt: /home/worker/workspace
+      level-{{level}}-{{project}}-build-nexus-5l-eng-opt-objdir-gecko: /home/worker/objdir-gecko
     features:
       relengAPIProxy: true
     env:
       TARGET: 'nexus-5-l'
   extra:
     treeherderEnv:
       - production
       - staging