diff --git a/taskcluster/ci/build/linux.yml b/taskcluster/ci/build/linux.yml
index c19410347f78..29fe7f249953 100644
--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -249,6 +249,7 @@ linux64-base-toolchains/opt:
         symbol: Bb
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
+        docker-image: {in-tree: debian7-amd64-build-base}
         max-run-time: 7200
         env:
             PERFHERDER_EXTRA_OPTIONS: base-toolchains
diff --git a/taskcluster/ci/docker-image/kind.yml b/taskcluster/ci/docker-image/kind.yml
index 707b8f5b3bd1..6cea805fa2ef 100644
--- a/taskcluster/ci/docker-image/kind.yml
+++ b/taskcluster/ci/docker-image/kind.yml
@@ -44,6 +44,14 @@ jobs:
     packages:
       - deb7-cmake
       - deb7-ninja
+  debian7-amd64-build-base:
+    symbol: I(deb7-bb)
+    parent: debian7-base
+    definition: debian7-build
+    packages:
+      - deb7-valgrind
+    args:
+      ARCH: amd64
   debian7-amd64-build:
     symbol: I(deb7)
     parent: debian7-base