diff --git a/.taskcluster.yml b/.taskcluster.yml
index ec29dc076..2a62f95e1 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -13,17 +13,11 @@ tasks:
             $if: 'tasks_for in ["cron", "action"]'
             then: '${tasks_for}@noreply.mozilla.org'
             else:
-                $if: 'event.sender.login == "bors[bot]"'
-                then: 'skaspari+mozlando@mozilla.com'   # It must match what's in bors.toml
+                $if: 'tasks_for == "github-push"'
+                then: '${event.pusher.email}'
                 else:
-                    $if: 'event.sender.login == "github-actions[bot]"'
-                    then: 'github-actions[bot]@users.noreply.github.com'
-                    else:
-                        $if: 'tasks_for == "github-push"'
-                        then: '${event.pusher.email}'
-                        else:
-                            $if: 'tasks_for == "github-pull-request"'
-                            then: '${event.pull_request.user.login}@users.noreply.github.com'
+                    $if: 'tasks_for == "github-pull-request"'
+                    then: '${event.pull_request.user.login}@users.noreply.github.com'
         baseRepoUrl:
             $if: 'tasks_for == "github-push"'
             then: '${event.repository.html_url}'