diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index a2b48777783..c979e3e80d0 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -10,6 +10,9 @@ from decisionlib import CONFIG, SHARED
 
 
 def main(task_for):
+    if CONFIG.legacy_tc_deployment:  # pragma: no cover
+        return
+
     if CONFIG.git_ref.startswith("refs/heads/"):
         branch = CONFIG.git_ref[len("refs/heads/"):]
         CONFIG.treeherder_repository_name = "servo-" + (
@@ -72,26 +75,6 @@ def main(task_for):
                 android_x86_wpt
             ],
         }
-        if not CONFIG.legacy_tc_deployment:  # pragma: no cover
-            by_branch_name = {
-                "auto": [
-                    # Everything not running on macOS,
-                    # which only has one worker on Community-TC for now
-                    linux_tidy_unit,
-                    linux_docs_check,
-                    windows_unit,
-                    windows_arm64,
-                    windows_uwp_x64,
-                    android_arm32_dev,
-                    android_arm32_release,
-                    android_x86_wpt,
-                    linux_wpt,
-                    linux_release,
-                ],
-                "master": [
-                    upload_docs,
-                ],
-            }
         for function in by_branch_name.get(branch, []):
             function()
 
@@ -913,7 +896,7 @@ def macos_build_task(name):
     build_task = (
         macos_task(name)
         # Allow long runtime in case the cache expired for all those Homebrew dependencies
-        .with_max_run_time_minutes(60 * 2)
+        .with_max_run_time_minutes(60 * 4)
         .with_env(**build_env, **unix_build_env, **macos_build_env)
         .with_repo()
         .with_python2()
@@ -1015,10 +998,10 @@ def magicleap_nightly():
 CONFIG.task_name_template = "Servo: %s"
 CONFIG.docker_images_expire_in = build_dependencies_artifacts_expire_in
 CONFIG.repacked_msi_files_expire_in = build_dependencies_artifacts_expire_in
-if CONFIG.legacy_tc_deployment:
+if CONFIG.legacy_tc_deployment:  # pragma: no cover
     CONFIG.index_prefix = "project.servo.servo"
     CONFIG.docker_image_build_worker_type = "servo-docker-worker"
-else:  # pragma: no cover
+else:
     CONFIG.index_prefix = "project.servo"
     CONFIG.default_provisioner_id = "proj-servo"
     CONFIG.docker_image_build_worker_type = "docker"
diff --git a/etc/taskcluster/decisionlib.py b/etc/taskcluster/decisionlib.py
index 976e5cd99d2..96defe457d7 100644
--- a/etc/taskcluster/decisionlib.py
+++ b/etc/taskcluster/decisionlib.py
@@ -60,9 +60,9 @@ class Config:
         self.tc_root_url = os.environ.get("TASKCLUSTER_ROOT_URL")
         self.legacy_tc_deployment = self.tc_root_url == "https://taskcluster.net"
 
-        if self.legacy_tc_deployment:
+        if self.legacy_tc_deployment:  # pragma: no cover
             self.default_provisioner_id = "aws-provisioner-v1"
-        else:  # pragma: no cover
+        else:
             self.default_provisioner_id = "proj-example"
 
 
@@ -620,9 +620,9 @@ class UnixTaskMixin(Task):
         """.format(n=n))
 
     def with_curl_artifact_script(self, task_id, artifact_name, out_directory=""):
-        if CONFIG.legacy_tc_deployment:
+        if CONFIG.legacy_tc_deployment:  # pragma: no cover
             queue_service = "https://queue.taskcluster.net"
-        else:  # pragma: no cover
+        else:
             queue_service = CONFIG.tc_root_url + "/api/queue"
         return self \
         .with_dependencies(task_id) \
diff --git a/etc/taskcluster/mock.py b/etc/taskcluster/mock.py
index 1f66eb0c492..9299c7c84df 100755
--- a/etc/taskcluster/mock.py
+++ b/etc/taskcluster/mock.py
@@ -44,7 +44,7 @@ sys.modules["taskcluster"] = sys.modules[__name__]
 sys.dont_write_bytecode = True
 os.environ.update(**{k: k for k in "TASK_ID TASK_OWNER TASK_SOURCE GIT_URL GIT_SHA".split()})
 os.environ["GIT_REF"] = "refs/heads/auto"
-os.environ["TASKCLUSTER_ROOT_URL"] = "https://taskcluster.net"
+os.environ["TASKCLUSTER_ROOT_URL"] = "https://community-tc.services.mozilla.com"
 os.environ["TASKCLUSTER_PROXY_URL"] = "http://taskcluster"
 os.environ["NEW_AMI_WORKER_TYPE"] = "-"
 import decision_task