diff --git a/.taskcluster.yml b/.taskcluster.yml
index b175ab5da..aaf457d5e 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -17,15 +17,17 @@ tasks:
                   $if: 'tasks_for in ["cron", "action"]'
                   then: '${tasks_for}@noreply.mozilla.org'
                   else:
-                      $if: 'tasks_for == "github-push"'
-                      then: '${event.pusher.email}'
-                      # Assume Pull Request
+                      $if: 'event.sender.login == "bors[bot]"'
+                      then: 'skaspari+mozlando@mozilla.com'   # It must match what's in bors.toml
                       else:
-                          $if: 'tasks_for == "github-pull-request"'
-                          then: '${event.pull_request.user.login}@users.noreply.github.com'
+                          $if: 'tasks_for == "github-push"'
+                          then: '${event.pusher.email}'
                           else:
-                              $if: 'tasks_for == "github-release"'
-                              then: '${event.sender.login}@users.noreply.github.com'
+                              $if: 'tasks_for == "github-pull-request"'
+                              then: '${event.pull_request.user.login}@users.noreply.github.com'
+                              else:
+                                  $if: 'tasks_for == "github-release"'
+                                  then: '${event.sender.login}@users.noreply.github.com'
               baseRepoUrl:
                   $if: 'tasks_for in ["github-push", "github-release"]'
                   then: '${event.repository.html_url}'
@@ -101,7 +103,7 @@ tasks:
               $if: >
                 tasks_for in ["action", "cron"]
                 || (tasks_for == "github-pull-request" && pullRequestAction in ["opened", "reopened", "synchronize"])
-                || (tasks_for == "github-push" && head_branch[:10] != "refs/tags/")
+                || (tasks_for == "github-push" && head_branch[:10] != "refs/tags/") && (head_branch != "staging.tmp") && (head_branch != "trying.tmp")
                 || (tasks_for == "github-release" && releaseAction == "published")
               then:
                   $let:
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 000000000..7000995c9
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,13 @@
+status = []
+block_labels = [
+  "needs:data-review",
+  "do not land",
+  "pr:work-in-progress",
+  "pr:needs-changes"
+]
+required_approvals = 0
+delete_merged_branches = true
+cut_body_after = "---"
+[committer]
+name = "MozLando"
+email = "skaspari+mozlando@mozilla.com"