diff --git a/taskcluster/ci/hazard/kind.yml b/taskcluster/ci/hazard/kind.yml
index cbda071ab32f..2b9c12373d75 100644
--- a/taskcluster/ci/hazard/kind.yml
+++ b/taskcluster/ci/hazard/kind.yml
@@ -43,7 +43,7 @@ jobs:
         toolchains:
             - linux64-clang
             - linux64-gcc-6
-            - linux64-gcc-sixgill
+            - linux64-sixgill
             - linux64-rust
 
     linux64-haz/debug:
@@ -63,5 +63,5 @@ jobs:
         toolchains:
             - linux64-clang
             - linux64-gcc-6
-            - linux64-gcc-sixgill
+            - linux64-sixgill
             - linux64-rust
diff --git a/taskcluster/ci/toolchain/linux.yml b/taskcluster/ci/toolchain/linux.yml
index df8c2b9bc3ae..d96bd1f44790 100755
--- a/taskcluster/ci/toolchain/linux.yml
+++ b/taskcluster/ci/toolchain/linux.yml
@@ -197,7 +197,7 @@ linux64-gcc-7:
             - 'build/unix/build-gcc/build-gcc.sh'
         toolchain-artifact: public/build/gcc.tar.xz
 
-linux64-gcc-sixgill:
+linux64-sixgill:
     description: "sixgill GCC plugin build"
     treeherder:
         kind: build