--- a/taskcluster/ci/hazard/kind.yml
+++ b/taskcluster/ci/hazard/kind.yml
@@ -28,17 +28,16 @@ jobs:
                 gecko-v1: shell-haz.debug
                 gecko-v2: shell-haz-debug
         treeherder:
             platform: linux64/debug
             symbol: SM-tc(H)
         run:
             using: hazard
             tooltool-manifest: "browser/config/tooltool-manifests/linux64/hazard.manifest"
-            secrets: true  # TODO(taskdiff): don't use secrets for these jobs
             command: >
                 tc-vcs checkout workspace/gecko "$GECKO_BASE_REPOSITORY" "$GECKO_HEAD_REPOSITORY" "$GECKO_HEAD_REV" "$GECKO_HEAD_REF"
                 && cd ./workspace/gecko/taskcluster/scripts/builder
                 && ./build-haz-linux.sh --project shell $HOME/workspace
         run-on-projects:
             - integration
             - release
         when:
@@ -55,17 +54,16 @@ jobs:
                 gecko-v2: browser-haz-debug
         treeherder:
             platform: linux64/debug
             symbol: tc(H)
         run:
             using: hazard
             tooltool-manifest: "browser/config/tooltool-manifests/linux64/hazard.manifest"
             mozconfig: "browser/config/mozconfigs/linux64/hazards"
-            secrets: true  # TODO(taskdiff): don't use secrets for these jobs
             command: >
                 tc-vcs checkout workspace/gecko "$GECKO_BASE_REPOSITORY" "$GECKO_HEAD_REPOSITORY" "$GECKO_HEAD_REV" "$GECKO_HEAD_REF"
                 && cd ./workspace/gecko/taskcluster/scripts/builder
                 && ./build-haz-linux.sh --project browser $HOME/workspace
 
     linux64-mulet-haz/debug:
         description: "Mulet Hazard Analysis Linux"
         index:
@@ -82,12 +80,11 @@ jobs:
             - try
         worker-type: aws-provisioner-v1/mulet-debug  # TODO (taskdiff): change to default
         worker:
             docker-image: {in-tree: builder}
         run:
             using: hazard
             tooltool-manifest: "gecko/b2g/dev/config/tooltool-manifests/linux64/hazard.manifest"
             mozconfig: "b2g/dev/config/mozconfigs/linux64/mulet-hazards"
-            secrets: false  # TODO(taskdiff): don't use secrets for these jobs
             command: >
                 checkout-gecko workspace && cd ./workspace/gecko/taskcluster/scripts/builder
                 && buildbot_step 'Build' ./build-mulet-haz-linux.sh $HOME/workspace