--- a/taskcluster/taskgraph/transforms/job/toolchain.py
+++ b/taskcluster/taskgraph/transforms/job/toolchain.py
@@ -7,17 +7,18 @@ Support for running toolchain-building j
 
 from __future__ import absolute_import, print_function, unicode_literals
 
 from voluptuous import Schema, Required, Any
 
 from taskgraph.transforms.job import run_job_using
 from taskgraph.transforms.job.common import (
     docker_worker_add_tc_vcs_cache,
-    docker_worker_add_gecko_vcs_env_vars
+    docker_worker_add_gecko_vcs_env_vars,
+    docker_worker_support_vcs_checkout,
 )
 
 toolchain_run_schema = Schema({
     Required('using'): 'toolchain-script',
 
     # the script (in taskcluster/scripts/misc) to run
     Required('script'): basestring,
 
@@ -42,16 +43,17 @@ def docker_worker_toolchain(config, job,
     worker['artifacts'].append({
         'name': 'public',
         'path': '/home/worker/workspace/artifacts/',
         'type': 'directory',
     })
 
     docker_worker_add_tc_vcs_cache(config, job, taskdesc)
     docker_worker_add_gecko_vcs_env_vars(config, job, taskdesc)
+    docker_worker_support_vcs_checkout(config, job, taskdesc)
 
     env = worker['env']
     env.update({
         'MOZ_BUILD_DATE': config.params['moz_build_date'],
         'MOZ_SCM_LEVEL': config.params['level'],
         'TOOLS_DISABLE': 'true',
     })
 
@@ -71,22 +73,26 @@ def docker_worker_toolchain(config, job,
         worker['relengapi-proxy'] = True
         taskdesc['scopes'].extend([
             'docker-worker:relengapi-proxy:tooltool.download.public',
         ])
         if run['tooltool-downloads'] == 'internal':
             taskdesc['scopes'].append(
                 'docker-worker:relengapi-proxy:tooltool.download.internal')
 
-    command = ' && '.join([
-        "cd /home/worker/",
-        "./bin/checkout-sources.sh",
-        "./workspace/build/src/taskcluster/scripts/misc/" + run['script'],
-    ])
-    worker['command'] = ["/bin/bash", "-c", command]
+    worker['command'] = [
+        '/home/worker/bin/run-task',
+        '--vcs-checkout=/home/worker/workspace/build/src',
+        '--',
+        'bash',
+        '-c',
+        'cd /home/worker && '
+        './workspace/build/src/taskcluster/scripts/misc/{}'.format(
+            run['script'])
+    ]
 
 
 @run_job_using("generic-worker", "toolchain-script", schema=toolchain_run_schema)
 def windows_toolchain(config, job, taskdesc):
     run = job['run']
 
     worker = taskdesc['worker']