--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -62,17 +62,17 @@ tasks:
         GECKO_HEAD_REF: 'default'
         COMM_BASE_REPOSITORY: 'https://hg.mozilla.org/comm-central'
         COMM_HEAD_REPOSITORY: '${repoUrl}'
         COMM_HEAD_REF: '${push.revision}'
         COMM_HEAD_REV: '${push.revision}'
         HG_STORE_PATH: /buillds/worker/checkouts/hg-store
 
       cache:
-        level-${repository.level}-checkouts: /builds/worker/checkouts
+        level-${repository.level}-checkouts-sparse-v1: /builds/worker/checkouts
 
       features:
         taskclusterProxy: true
         chainOfTrust: true
 
       # Note: This task is built server side without the context or tooling that
       # exist in tree so we must hard code the hash
       # XXX Changing this will break Chain of Trust without an associated puppet and
@@ -80,24 +80,24 @@ tasks:
       image: 'taskcluster/decision:2.0.0@sha256:4039fd878e5700b326d4a636e28c595c053fbcb53909c1db84ad1f513cf644ef'
 
       maxRunTime: 1800
 
       # TODO use mozilla-unified for the base repository once the tc-vcs
       # tar.gz archives are created or tc-vcs isn't being used.
       command:
         - /builds/worker/bin/run-task
-        - '--vcs-checkout=/builds/worker/build/mozilla'
+        - '--vcs-checkout=/builds/worker/checkouts/gecko'
         - '--sparse-profile=build/sparse-profiles/taskgraph'
-        - '--comm-checkout=/builds/worker/build/mozilla/comm'
+        - '--comm-checkout=/builds/worker/checkouts/gecko/comm'
         - '--'
         - bash
         - -cx
         - >
-            cd /builds/worker/build/mozilla &&
+            cd /builds/worker/checkouts/gecko &&
             ln -s /builds/worker/artifacts artifacts &&
             ./mach --log-no-times taskgraph decision
             --root comm/taskcluster/ci
             --pushlog-id='${push.pushlog_id}'
             --pushdate='${push.pushdate}'
             --project='${repository.project}'
             --message="$GECKO_COMMIT_MSG"
             --owner='${ownerEmail}'