diff --git a/.taskcluster.yml b/.taskcluster.yml
index 7f95001986275..f259d6b2a522f 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -450,8 +450,11 @@ tasks:
                                                 - "tc-treeherder.v2.${project}.${headRev}"
                                                 - "index.${trustDomain}.v2.${project}.latest.taskgraph.decision"
                                                 - "index.${trustDomain}.v2.${project}.revision.${headRev}.taskgraph.decision"
-                                            'eventType == "action"':
+                                            'tasks_for == "action"':
+                                                - "tc-treeherder.v2.${project}.${headRev}"
                                                 - "index.${trustDomain}.v2.${project}.revision.${headRev}.taskgraph.actions.${ownTaskId}"
+                                            'tasks_for == "pr-action"':
+                                                - "tc-treeherder.v2.${project}-pr.${headRev}"
                               scopes:
                                   $switch:
                                       isPullRequest:
diff --git a/taskcluster/gecko_taskgraph/actions/registry.py b/taskcluster/gecko_taskgraph/actions/registry.py
index 76b6d3424ed5d..4027976f8eb7d 100644
--- a/taskcluster/gecko_taskgraph/actions/registry.py
+++ b/taskcluster/gecko_taskgraph/actions/registry.py
@@ -318,7 +318,6 @@ def sanity_check_task_scope(callback, parameters, graph_config):
 
     repo_param = "{}head_repository".format(graph_config["project-repo-param-prefix"])
     head_repository = parameters[repo_param]
-    assert head_repository.startswith("https://hg.mozilla.org/")
     expected_scope = f"assume:repo:{head_repository[8:]}:action:{action.permission}"
 
     # the scope should appear literally; no need for a satisfaction check. The use of