--- a/taskcluster/ci/build/linux-base-toolchains.yml
+++ b/taskcluster/ci/build/linux-base-toolchains.yml
@@ -109,17 +109,17 @@ linux64-base-toolchains-clang/opt:
             - builds/releng_base_firefox.py
             - builds/releng_base_linux_64_builds.py
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         tooltool-downloads: public
         need-xvfb: true
     fetches:
         toolchain:
-            - linux64-binutils
+            - linux64-binutils-2.31.1
             - linux64-clang-5.0
             - linux64-rust-1.51
             - linux64-cbindgen
             - linux64-dump_syms
             - linux64-nasm-2.14.02
             - linux64-node-10
             - sysroot-x86_64-linux-gnu
 
@@ -148,16 +148,16 @@ linux64-base-toolchains-clang/debug:
         script: "mozharness/scripts/fx_desktop_build.py"
         secrets: true
         custom-build-variant-cfg: debug
         mozconfig-variant: debug
         tooltool-downloads: public
         need-xvfb: true
     fetches:
         toolchain:
-            - linux64-binutils
+            - linux64-binutils-2.31.1
             - linux64-clang-5.0
             - linux64-rust-1.51
             - linux64-cbindgen
             - linux64-dump_syms
             - linux64-nasm-2.14.02
             - linux64-node-10
             - sysroot-x86_64-linux-gnu

--- a/taskcluster/ci/fetch/toolchains.yml
+++ b/taskcluster/ci/fetch/toolchains.yml
@@ -25,16 +25,30 @@ binutils-2.31.1:
         size: 20467996
         gpg-signature:
             sig-url: "{url}.sig"
             key-path: build/unix/build-binutils/3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F.key
         artifact-name: binutils-source.tar.zst
         strip-components: 1
         add-prefix: binutils-source/
 
+binutils-2.36.1:
+    description: binutils 2.36.1 source code
+    fetch:
+        type: static-url
+        url: ftp://ftp.gnu.org/gnu/binutils/binutils-2.36.1.tar.xz
+        sha256: e81d9edf373f193af428a0f256674aea62a9d74dfe93f65192d4eae030b0f3b0
+        size: 22772248
+        gpg-signature:
+            sig-url: "{url}.sig"
+            key-path: build/unix/build-binutils/3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F.key
+        artifact-name: binutils-source.tar.zst
+        strip-components: 1
+        add-prefix: binutils-source/
+
 gcc-6.5.0:
     description: GCC 6.5.0 source code
     fetch:
         type: static-url
         url: ftp://ftp.gnu.org/gnu/gcc/gcc-6.5.0/gcc-6.5.0.tar.xz
         sha256: 7ef1796ce497e89479183702635b14bb7a46b53249209a5e0f999bebf4740945
         size: 74355588
         gpg-signature:

--- a/taskcluster/ci/toolchain/misc.yml
+++ b/taskcluster/ci/toolchain/misc.yml
@@ -32,28 +32,47 @@ linux64-llvm-dsymutil:
         script: build-llvm-dsymutil.sh
         toolchain-artifact: public/build/llvm-dsymutil.tar.xz
     fetches:
         fetch:
             - clang-11
         toolchain:
             - linux64-gcc-7
 
+linux64-binutils-2.31.1:
+    description: "Binutils toolchain build"
+    treeherder:
+        symbol: TL(binutil2.31)
+    run:
+        script: build-binutils-linux.sh
+        resources:
+            - 'build/unix/build-binutils/build-binutils.sh'
+        toolchain-artifact: public/build/binutils.tar.xz
+    fetches:
+        fetch:
+            - binutils-2.31.1
+        toolchain:
+            # Work around https://bugs.debian.org/786883 by using toolchain
+            # gcc. We can remove this workaround when we upgrade the toolchain
+            # docker image to Debian bullseye.
+            - linux64-gcc-7
+            - linux64-toolchain-sysroot
+
 linux64-binutils:
     description: "Binutils toolchain build"
     treeherder:
         symbol: TL(binutil)
     run:
         script: build-binutils-linux.sh
         resources:
             - 'build/unix/build-binutils/build-binutils.sh'
         toolchain-artifact: public/build/binutils.tar.xz
     fetches:
         fetch:
-            - binutils-2.31.1
+            - binutils-2.36.1
         toolchain:
             # Work around https://bugs.debian.org/786883 by using toolchain
             # gcc. We can remove this workaround when we upgrade the toolchain
             # docker image to Debian bullseye.
             - linux64-gcc-7
             - linux64-toolchain-sysroot
 
 linux64-hfsplus: