diff --git a/taskcluster/ci/signing/kind.yml b/taskcluster/ci/signing/kind.yml
index 87e55c0e70..a0b60e9940 100644
--- a/taskcluster/ci/signing/kind.yml
+++ b/taskcluster/ci/signing/kind.yml
@@ -40,9 +40,12 @@ job-template:
                 default: dep-signing
     signing-format: autograph_apk
     index:
-        by-build-type:
-            (nightly|debug|nightly-simulation|beta|release):
-                type: signing
+        by-tasks-for:
+            (action|cron|github-release):
+                by-build-type:
+                    (nightly|debug|nightly-simulation|beta|release):
+                        type: signing
+                    default: {}
             default: {}
     run-on-tasks-for:
         by-build-type:
diff --git a/taskcluster/fenix_taskgraph/transforms/signing.py b/taskcluster/fenix_taskgraph/transforms/signing.py
index 8c6570fccb..b3cf7661ee 100644
--- a/taskcluster/fenix_taskgraph/transforms/signing.py
+++ b/taskcluster/fenix_taskgraph/transforms/signing.py
@@ -26,6 +26,7 @@ def resolve_keys(config, tasks):
                 **{
                     'build-type': task["attributes"]["build-type"],
                     'level': config.params["level"],
+                    'tasks-for': config.params["tasks_for"],
                 }
             )
         yield task