--- a/taskcluster/taskgraph/action.yml
+++ b/taskcluster/taskgraph/action.yml
@@ -54,19 +54,17 @@ payload:
     - /home/worker/bin/run-task
     - '--vcs-checkout=/home/worker/checkouts/gecko'
     - '--'
     - bash
     - -cx
     - >
         cd /home/worker/checkouts/gecko &&
         ln -s /home/worker/artifacts artifacts &&
-        ./mach --log-no-times taskgraph action-task
-        --decision-id='{{decision_task_id}}'
-        --task-label='{{task_labels}}'
+        ./mach --log-no-times taskgraph action-task {{action_args}}
 
   artifacts:
     'public':
       type: 'directory'
       path: '/home/worker/artifacts'
       expires: '{{#from_now}}7 days{{/from_now}}'
 
 extra:

--- a/taskcluster/taskgraph/decision.py
+++ b/taskcluster/taskgraph/decision.py
@@ -176,14 +176,13 @@ def write_artifact(filename, data):
     else:
         raise TypeError("Don't know how to write to {}".format(filename))
 
 
 def get_action_yml(parameters):
     templates = Templates(os.path.join(GECKO, "taskcluster/taskgraph"))
     action_parameters = parameters.copy()
     action_parameters.update({
-        "decision_task_id": "{{decision_task_id}}",
-        "task_labels": "{{task_labels}}",
+        "action_args": "{{action_args}}",
         "from_now": json_time_from_now,
         "now": current_json_time()
     })
     return templates.load('action.yml', action_parameters)