--- a/taskcluster/ci/legacy/tasks/builds/base_linux32.yml
+++ b/taskcluster/ci/legacy/tasks/builds/base_linux32.yml
@@ -7,22 +7,22 @@ task:
 
   routes:
     - 'index.buildbot.branches.{{project}}.linux'
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.linux'
 
   scopes:
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux32-workspace'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux32-{{build_type}}-workspace'
 
   payload:
     cache:
       tooltool-cache: '/home/worker/tooltool-cache'
-      level-{{level}}-{{project}}-build-linux32-workspace: '/home/worker/workspace'
+      level-{{level}}-{{project}}-build-linux32-{{build_type}}-workspace: '/home/worker/workspace'
 
     features:
       relengAPIProxy: true
 
     env:
       MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
       MOZHARNESS_CONFIG: 'builds/releng_base_linux_32_builds.py balrog/production.py'
       MOZHARNESS_ACTIONS: 'get-secrets build check-test generate-build-stats update'

--- a/taskcluster/ci/legacy/tasks/builds/base_linux64.yml
+++ b/taskcluster/ci/legacy/tasks/builds/base_linux64.yml
@@ -3,22 +3,22 @@
   variables:
     build_name: 'linux64'
 task:
   #workerType: ..
 
   scopes:
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-{{build_name}}-workspace'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-linux64-{{build_type}}-workspace'
 
   payload:
     cache:
       tooltool-cache: '/home/worker/tooltool-cache'
-      level-{{level}}-{{project}}-build-{{build_name}}-workspace: '/home/worker/workspace'
+      level-{{level}}-{{project}}-build-linux64-{{build_type}}-workspace: '/home/worker/workspace'
 
     features:
       relengAPIProxy: true
 
     env:
       MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
       MOZHARNESS_CONFIG: 'builds/releng_base_linux_64_builds.py balrog/production.py'
       MOZHARNESS_ACTIONS: 'get-secrets build check-test generate-build-stats update'