diff --git a/build/sparse-profiles/docker-image b/build/sparse-profiles/docker-image
new file mode 100644
index 000000000000..d375bea387db
--- /dev/null
+++ b/build/sparse-profiles/docker-image
@@ -0,0 +1,16 @@
+%include build/sparse-profiles/mach
+
+[include]
+path:taskcluster/
+
+# Result from `grep -hr %include taskcluster/docker | grep -v " taskcluster/" | sort -u`
+path:build/unix/build-gtk3/build-gtk3.sh
+path:build/valgrind/valgrind-epochs.patch
+path:python/mozbuild/mozbuild/action/tooltool.py
+path:testing/config/tooltool-manifests/linux64/releng.manifest
+path:testing/mozharness/external_tools/robustcheckout.py
+path:tools/lint/eslint/eslint-plugin-mozilla/manifest.tt
+path:tools/lint/eslint/manifest.tt
+path:tools/lint/python/flake8_requirements.txt
+path:tools/lint/tox/tox_requirements.txt
+
diff --git a/taskcluster/docker/image_builder/build-image.sh b/taskcluster/docker/image_builder/build-image.sh
index 58c585b3d271..917539b9e086 100755
--- a/taskcluster/docker/image_builder/build-image.sh
+++ b/taskcluster/docker/image_builder/build-image.sh
@@ -24,6 +24,7 @@ CONTEXT_FILE=/builds/worker/workspace/context.tar
 # Run ./mach taskcluster-build-image with --context-only to build context
 run-task \
   --vcs-checkout "/builds/worker/checkouts/gecko" \
+  --sparse-profile build/sparse-profiles/docker-image \
   -- \
   /builds/worker/checkouts/gecko/mach taskcluster-build-image \
   --context-only "$CONTEXT_FILE" \
diff --git a/taskcluster/taskgraph/transforms/docker_image.py b/taskcluster/taskgraph/transforms/docker_image.py
index d1bf9b4385d6..047a4b56bb1b 100644
--- a/taskcluster/taskgraph/transforms/docker_image.py
+++ b/taskcluster/taskgraph/transforms/docker_image.py
@@ -168,7 +168,7 @@ def fill_template(config, tasks):
             cache_name = 'imagebuilder-v1'
         else:
             worker['docker-image'] = {'in-tree': 'image_builder'}
-            cache_name = 'imagebuilder-{}'.format(_run_task_suffix())
+            cache_name = 'imagebuilder-sparse-{}'.format(_run_task_suffix())
             # Force images built against the in-tree image builder to
             # have a different digest by adding a fixed string to the
             # hashed data.