diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index fa57c6f669e..f0c343e674c 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -11,7 +11,7 @@ from decisionlib import *
 def main(task_for, mock=False):
     if task_for == "github-push":
         if CONFIG.git_ref in ["refs/heads/auto", "refs/heads/try", "refs/heads/try-taskcluster"]:
-            CONFIG.treeherder_repo_name = "servo/servo-" + CONFIG.git_ref.split("/")[-1]
+            CONFIG.treeherder_repo_name = "servo-" + CONFIG.git_ref.split("/")[-1]
 
             linux_tidy_unit()
             android_arm32()
diff --git a/etc/taskcluster/decisionlib.py b/etc/taskcluster/decisionlib.py
index 294a0b752fd..77197b1bd0b 100644
--- a/etc/taskcluster/decisionlib.py
+++ b/etc/taskcluster/decisionlib.py
@@ -158,7 +158,7 @@ class Task:
 
         if CONFIG.treeherder_repo_name:
             assert CONFIG.git_sha
-            suffix = ".v2.%s.%s" % (CONFIG.treeherder_repo_name, CONFIG.git_sha)
+            suffix = ".v2._/%s.%s" % (CONFIG.treeherder_repo_name, CONFIG.git_sha)
             self.with_routes(
                 "tc-treeherder" + suffix,
                 "tc-treeherder-staging" + suffix,