--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -47,29 +47,32 @@ tasks:
     scopes:
       - 'assume:repo:${repoUrl[8:]}:*'
       - 'queue:route:notify.email.${ownerEmail}.*'
 
     dependencies: []
     requires: all-completed
 
     priority: lowest
+    retries: 5
 
     payload:
       env:
         # checkout-gecko uses these to check out the source; the inputs
         # to `mach taskgraph decision` are all on the command line.
         GECKO_BASE_REPOSITORY: 'https://hg.mozilla.org/mozilla-unified'
         GECKO_HEAD_REPOSITORY: 'https://hg.mozilla.org/mozilla-central'
         GECKO_HEAD_REF: 'default'
         COMM_BASE_REPOSITORY: 'https://hg.mozilla.org/comm-central'
         COMM_HEAD_REPOSITORY: '${repoUrl}'
+        COMM_COMMIT_MSG: '${push.comment}'
         COMM_HEAD_REF: '${push.revision}'
         COMM_HEAD_REV: '${push.revision}'
         HG_STORE_PATH: /buillds/worker/checkouts/hg-store
+        TASKCLUSTER_CACHES: /builds/worker/checkouts
 
       cache:
         level-${repository.level}-checkouts-sparse-v1: /builds/worker/checkouts
 
       features:
         taskclusterProxy: true
         chainOfTrust: true
 
@@ -94,17 +97,17 @@ tasks:
         - >
             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"
+            --message="$COMM_COMMIT_MSG"
             --owner='${ownerEmail}'
             --level='${repository.level}'
             --base-repository='https://hg.mozilla.org/mozilla-central'
             --head-repository="$GECKO_HEAD_REPOSITORY"
             --head-ref="$GECKO_HEAD_REF"
             --head-rev="$GECKO_HEAD_REV"
             --comm-base-repository="$COMM_BASE_REPOSITORY"
             --comm-head-repository="$COMM_HEAD_REPOSITORY"
@@ -115,8 +118,10 @@ tasks:
         'public':
           type: 'directory'
           path: '/builds/worker/artifacts'
           expires: {$fromNow: '1 year'}
 
     extra:
       treeherder:
         symbol: D
+        machine:
+          platform: gecko-decision