diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml
index d2beac80c934..6c47fe7dcf08 100644
--- a/taskcluster/ci/docker-image/kind.yml
+++ b/taskcluster/ci/docker-image/kind.yml
@@ -72,8 +72,6 @@ jobs:
         symbol: I(deb8)
         parent: debian8-base
         definition: debian-build
-        packages:
-            - deb8-valgrind
         args:
             ARCH: amd64
     debian8-mozjs-rust-build:
@@ -84,6 +82,8 @@ jobs:
     valgrind-build:
         symbol: I(vb)
         parent: debian8-amd64-build
+        packages:
+            - deb8-valgrind
     lint:
         symbol: I(lnt)
     # Neither the debian10-raw nor the debian10-packages images can have
diff --git a/taskcluster/docker/debian-build/Dockerfile b/taskcluster/docker/debian-build/Dockerfile
index ce34fa4f2705..b01eacd4ab8e 100644
--- a/taskcluster/docker/debian-build/Dockerfile
+++ b/taskcluster/docker/debian-build/Dockerfile
@@ -67,7 +67,6 @@ RUN apt-get update && \
       tar \
       unzip \
       uuid \
-      valgrind \
       wget \
       x11-utils \
       xvfb \
diff --git a/taskcluster/docker/valgrind-build/Dockerfile b/taskcluster/docker/valgrind-build/Dockerfile
index a2cbf50550c2..c0b634aff0ce 100644
--- a/taskcluster/docker/valgrind-build/Dockerfile
+++ b/taskcluster/docker/valgrind-build/Dockerfile
@@ -5,12 +5,16 @@ VOLUME /builds/worker/checkouts
 VOLUME /builds/worker/workspace
 VOLUME /builds/worker/tooltool-cache
 
+ARG TASKCLUSTER_ROOT_URL
+ARG DOCKER_IMAGE_PACKAGES
+RUN /usr/local/sbin/setup_packages.sh $TASKCLUSTER_ROOT_URL $DOCKER_IMAGE_PACKAGES
+
 # We could try to be smart and install all the -dbg packages corresponding to
 # the installed packages, but, not all of them are actually for libraries used
 # by Firefox, leading to a larger docker image. Moreover, some of the -dbg
 # packages for unnecessary libraries pull other packages through dependencies,
 # that make for even larger docker images.
-RUN apt-get install \
+RUN apt-get update && apt-get install \
     dbus-1-dbg \
     libatk-bridge2.0-0-dbg \
     libatk1.0-dbg \