--- a/taskcluster/docker/android-build/Dockerfile
+++ b/taskcluster/docker/android-build/Dockerfile
@@ -98,17 +98,18 @@ RUN bash /setup/system-setup.sh
 # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb.
 # %include taskcluster/docker/recipes/xvfb.sh
 COPY topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
 
 # %include taskcluster/docker/recipes/run-task
 COPY topsrcdir/taskcluster/docker/recipes/run-task /builds/worker/bin/run-task
 
 # Add pip configuration, among other things.
-COPY dot-config /builds/worker/.config
+# %include taskcluster/docker/recipes/dot-config
+COPY topsrcdir/taskcluster/docker/recipes/dot-config /builds/worker/.config
 
 # Stubbed out credentials; mozharness looks for this file an issues a WARNING
 # if it's not found, which causes the build to fail.  Note that this needs to
 # be in the parent of the workspace directory and in the directory where
 # mozharness is run (not its --work-dir).  See Bug 1169652.
 # %include taskcluster/docker/desktop-build/oauth.txt
 COPY topsrcdir/taskcluster/docker/desktop-build/oauth.txt /builds/worker/
 

--- a/taskcluster/docker/desktop-build/Dockerfile
+++ b/taskcluster/docker/desktop-build/Dockerfile
@@ -39,17 +39,18 @@ RUN bash /setup/build-gtk3.sh && bash /s
 # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
 # %include taskcluster/docker/recipes/xvfb.sh
 ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
 
 # %include taskcluster/docker/recipes/run-task
 ADD topsrcdir/taskcluster/docker/recipes/run-task /builds/worker/bin/run-task
 
 # Add configuration
-COPY            dot-config                    /builds/worker/.config
+# %include taskcluster/docker/recipes/dot-config
+COPY topsrcdir/taskcluster/docker/recipes/dot-config /builds/worker/.config
 
 # Generate machine uuid file
 RUN dbus-uuidgen --ensure=/var/lib/dbus/machine-id
 
 # Stubbed out credentials; mozharness looks for this file an issues a WARNING
 # if it's not found, which causes the build to fail.  Note that this needs to
 # be in the parent of the workspace directory and in the directory where
 # mozharness is run (not its --work-dir).  See Bug 1169652.

deleted file mode 100644
--- a/taskcluster/docker/desktop-build/dot-config/pip/pip.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[global]
-disable-pip-version-check = true

rename from taskcluster/docker/android-build/dot-config/pip/pip.conf
rename to taskcluster/docker/recipes/dot-config/pip/pip.conf

--- a/taskcluster/docker/valgrind-build/Dockerfile
+++ b/taskcluster/docker/valgrind-build/Dockerfile
@@ -42,18 +42,18 @@ RUN bash /setup/build-gtk3.sh && bash /s
 # Add wrapper scripts for xvfb allowing tasks to easily retry starting up xvfb
 # %include taskcluster/docker/recipes/xvfb.sh
 ADD topsrcdir/taskcluster/docker/recipes/xvfb.sh /builds/worker/scripts/xvfb.sh
 
 # %include taskcluster/docker/recipes/run-task
 ADD topsrcdir/taskcluster/docker/recipes/run-task /builds/worker/bin/run-task
 
 # Add configuration
-# %include taskcluster/docker/desktop-build/dot-config
-ADD topsrcdir/taskcluster/docker/desktop-build/dot-config /builds/worker/.config
+# %include taskcluster/docker/recipes/dot-config
+ADD topsrcdir/taskcluster/docker/recipes/dot-config /builds/worker/.config
 
 # Generate machine uuid file
 RUN dbus-uuidgen --ensure=/var/lib/dbus/machine-id
 
 # Stubbed out credentials; mozharness looks for this file an issues a WARNING
 # if it's not found, which causes the build to fail.  Note that this needs to
 # be in the parent of the workspace directory and in the directory where
 # mozharness is run (not its --work-dir).  See Bug 1169652.