diff --git a/testing/taskcluster/tasks/builds/android_api_11.yml b/testing/taskcluster/tasks/builds/android_api_11.yml
index 2b1f8b85220b..215118b4eb6b 100644
--- a/testing/taskcluster/tasks/builds/android_api_11.yml
+++ b/testing/taskcluster/tasks/builds/android_api_11.yml
@@ -15,7 +15,7 @@ task:
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-11'
 
   scopes:
-    - 'docker-worker:cache:build-android-api-11-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-android-api-11-c6-workspace'
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.internal'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
@@ -23,7 +23,7 @@ task:
   payload:
     image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
-      build-android-api-11-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-android-api-11-c6-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'
 
     features:
diff --git a/testing/taskcluster/tasks/builds/android_api_11_b2gdroid.yml b/testing/taskcluster/tasks/builds/android_api_11_b2gdroid.yml
index 3d4fdfb024c3..f1d3beb40863 100644
--- a/testing/taskcluster/tasks/builds/android_api_11_b2gdroid.yml
+++ b/testing/taskcluster/tasks/builds/android_api_11_b2gdroid.yml
@@ -15,7 +15,7 @@ task:
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-11-b2gdroid'
 
   scopes:
-    - 'docker-worker:cache:build-android-api-11-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-android-api-11-c6-workspace'
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.internal'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
@@ -23,7 +23,7 @@ task:
   payload:
     image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
-      build-android-api-11-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-android-api-11-c6-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'
 
     features:
diff --git a/testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml b/testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml
index f79c5249ed25..6cea101d419d 100644
--- a/testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml
+++ b/testing/taskcluster/tasks/builds/android_api_11_partner_sample1.yml
@@ -15,7 +15,7 @@ task:
     - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-11-partner-sample1'
 
   scopes:
-    - 'docker-worker:cache:build-android-api-11-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-android-api-11-c6-workspace'
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.internal'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
@@ -23,7 +23,7 @@ task:
   payload:
     image: '{{#docker_image}}desktop-build{{/docker_image}}'
     cache:
-      build-android-api-11-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-android-api-11-c6-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'
 
     features:
diff --git a/testing/taskcluster/tasks/builds/dbg_linux32.yml b/testing/taskcluster/tasks/builds/dbg_linux32.yml
index fe0bb6196f2f..8bf71030627f 100644
--- a/testing/taskcluster/tasks/builds/dbg_linux32.yml
+++ b/testing/taskcluster/tasks/builds/dbg_linux32.yml
@@ -3,8 +3,8 @@ $inherits:
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:build-linux32-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux32-c6-workspace'
 
   payload:
     cache:
-      build-linux32-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-linux32-c6-workspace: '/home/worker/workspace'
diff --git a/testing/taskcluster/tasks/builds/dbg_linux64.yml b/testing/taskcluster/tasks/builds/dbg_linux64.yml
index 05998fa3d818..200362c2f7ad 100644
--- a/testing/taskcluster/tasks/builds/dbg_linux64.yml
+++ b/testing/taskcluster/tasks/builds/dbg_linux64.yml
@@ -3,8 +3,8 @@ $inherits:
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:build-linux64-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux64-c6-workspace'
 
   payload:
     cache:
-      build-linux64-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-linux64-c6-workspace: '/home/worker/workspace'
diff --git a/testing/taskcluster/tasks/builds/opt_linux32.yml b/testing/taskcluster/tasks/builds/opt_linux32.yml
index cbf94c0076a9..b504ffb52f4f 100644
--- a/testing/taskcluster/tasks/builds/opt_linux32.yml
+++ b/testing/taskcluster/tasks/builds/opt_linux32.yml
@@ -3,8 +3,8 @@ $inherits:
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:build-linux32-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux32-c6-workspace'
 
   payload:
     cache:
-      build-linux32-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-linux32-c6-workspace: '/home/worker/workspace'
diff --git a/testing/taskcluster/tasks/builds/opt_linux64.yml b/testing/taskcluster/tasks/builds/opt_linux64.yml
index 6631fb6af4d0..2adca9223884 100644
--- a/testing/taskcluster/tasks/builds/opt_linux64.yml
+++ b/testing/taskcluster/tasks/builds/opt_linux64.yml
@@ -3,8 +3,8 @@ $inherits:
 task:
   # same as clobber, but with a cached workspace
   scopes:
-    - 'docker-worker:cache:build-linux64-c6-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux64-c6-workspace'
 
   payload:
     cache:
-      build-linux64-c6-workspace: '/home/worker/workspace'
+      build-{{project}}-linux64-c6-workspace: '/home/worker/workspace'
diff --git a/testing/taskcluster/tasks/builds/opt_linux64_st-an.yml b/testing/taskcluster/tasks/builds/opt_linux64_st-an.yml
index 79805305eda9..75bc234b2507 100644
--- a/testing/taskcluster/tasks/builds/opt_linux64_st-an.yml
+++ b/testing/taskcluster/tasks/builds/opt_linux64_st-an.yml
@@ -9,7 +9,7 @@ task:
       description: 'Linux64 Static Analysis Opt'
 
   scopes:
-    - 'docker-worker:cache:build-linux64-st-an-workspace'
+    - 'docker-worker:cache:build-{{project}}-linux64-st-an-workspace'
 
   routes:
     - 'index.buildbot.branches.{{project}}.linux64-st-an'
@@ -17,7 +17,7 @@ task:
 
   payload:
     cache:
-      build-linux64-st-an-workspace: '/home/worker/workspace'
+      build-{{project}}-linux64-st-an-workspace: '/home/worker/workspace'
     env:
       MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
       MOZHARNESS_CONFIG: 'builds/releng_sub_linux_configs/64_stat_and_opt.py balrog/production.py'