diff --git a/build/sparse-profiles/docker-image b/build/sparse-profiles/docker-image
index f5efa9a0f2d4..da65bdf4b9e5 100644
--- a/build/sparse-profiles/docker-image
+++ b/build/sparse-profiles/docker-image
@@ -7,8 +7,8 @@ path:taskcluster/
 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/spell/codespell_requirements.txt
 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/lint/Dockerfile b/taskcluster/docker/lint/Dockerfile
index 75b08c339903..b80d4721103f 100644
--- a/taskcluster/docker/lint/Dockerfile
+++ b/taskcluster/docker/lint/Dockerfile
@@ -30,6 +30,8 @@ ADD topsrcdir/tools/lint/eslint/manifest.tt /tmp/eslint.tt
 ADD topsrcdir/tools/lint/eslint/eslint-plugin-mozilla/manifest.tt /tmp/eslint-plugin-mozilla.tt
 # %include tools/lint/python/flake8_requirements.txt
 ADD topsrcdir/tools/lint/python/flake8_requirements.txt /tmp/flake8_requirements.txt
+# %include tools/lint/spell/codespell_requirements.txt
+ADD topsrcdir/tools/lint/spell/codespell_requirements.txt /tmp/codespell_requirements.txt
 # %include tools/lint/tox/tox_requirements.txt
 ADD topsrcdir/tools/lint/tox/tox_requirements.txt /tmp/tox_requirements.txt
 RUN bash /tmp/system-setup.sh
diff --git a/taskcluster/docker/lint/system-setup.sh b/taskcluster/docker/lint/system-setup.sh
index 53df4d509df0..4be8486f6673 100644
--- a/taskcluster/docker/lint/system-setup.sh
+++ b/taskcluster/docker/lint/system-setup.sh
@@ -10,7 +10,6 @@ mkdir -p /setup
 cd /setup
 
 apt_packages=()
-apt_packages+=('codespell')
 apt_packages+=('curl')
 apt_packages+=('locales')
 apt_packages+=('git')
@@ -88,6 +87,14 @@ cd /setup
 
 pip install --require-hashes -r /tmp/flake8_requirements.txt
 
+###
+# codespell Setup
+###
+
+cd /setup
+
+pip install --require-hashes -r /tmp/codespell_requirements.txt
+
 ###
 # tox Setup
 ###
diff --git a/taskcluster/docker/update-verify/Dockerfile b/taskcluster/docker/update-verify/Dockerfile
index f20b523bb938..38c52cfd7bac 100644
--- a/taskcluster/docker/update-verify/Dockerfile
+++ b/taskcluster/docker/update-verify/Dockerfile
@@ -42,6 +42,8 @@ ADD topsrcdir/tools/lint/eslint/manifest.tt /tmp/eslint.tt
 ADD topsrcdir/tools/lint/eslint/eslint-plugin-mozilla/manifest.tt /tmp/eslint-plugin-mozilla.tt
 # %include tools/lint/python/flake8_requirements.txt
 ADD topsrcdir/tools/lint/python/flake8_requirements.txt /tmp/flake8_requirements.txt
+# %include tools/lint/spell/codespell_requirements.txt
+ADD topsrcdir/tools/lint/spell/codespell_requirements.txt /tmp/codespell_requirements.txt
 # %include tools/lint/tox/tox_requirements.txt
 ADD topsrcdir/tools/lint/tox/tox_requirements.txt /tmp/tox_requirements.txt
 RUN bash /tmp/system-setup.sh