--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -1004,17 +1004,20 @@ def build_task(config, tasks):
             routes.append('coalesce.v1.' + key)
 
         if 'priority' not in task:
             task['priority'] = BRANCH_PRIORITIES.get(
                 config.params['project'],
                 DEFAULT_BRANCH_PRIORITY)
 
         tags = task.get('tags', {})
-        tags.update({'createdForUser': config.params['owner']})
+        tags.update({
+            'createdForUser': config.params['owner'],
+            'kind': config.kind,
+        })
 
         task_def = {
             'provisionerId': provisioner_id,
             'workerType': worker_type,
             'routes': routes,
             'created': {'relative-datestamp': '0 seconds'},
             'deadline': {'relative-datestamp': task['deadline-after']},
             'expires': {'relative-datestamp': task['expires-after']},