diff --git a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
index 5ce8b5c5a736..06dbc314cc2d 100644
--- a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
+++ b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
@@ -17,7 +17,7 @@ job-defaults:
     worker-type: balrog
     worker:
         implementation: balrog
-        balrog-action: submit-toplevel
+        balrog-action: v2-submit-toplevel
         require-mirrors: true
         archive-domain:
             by-release-level:
diff --git a/taskcluster/taskgraph/transforms/balrog_submit.py b/taskcluster/taskgraph/transforms/balrog_submit.py
index 9e540054e449..bf8087a87368 100644
--- a/taskcluster/taskgraph/transforms/balrog_submit.py
+++ b/taskcluster/taskgraph/transforms/balrog_submit.py
@@ -116,7 +116,7 @@ def make_task_description(config, jobs):
             'worker': {
                 'implementation': 'balrog',
                 'upstream-artifacts': upstream_artifacts,
-                'balrog-action': 'submit-locale',
+                'balrog-action': 'v2-submit-locale',
                 'suffixes': ['', '-No-WNP'] if job.get('update-no-wnp') else [''],
             },
             'dependencies': {'beetmover': dep_job.label},
diff --git a/taskcluster/taskgraph/transforms/task.py b/taskcluster/taskgraph/transforms/task.py
index c6aa481b3105..5312a284b41d 100644
--- a/taskcluster/taskgraph/transforms/task.py
+++ b/taskcluster/taskgraph/transforms/task.py
@@ -1052,7 +1052,7 @@ def build_balrog_payload(config, task, task_def):
     if 'b' in release_config['version']:
         beta_number = release_config['version'].split('b')[-1]
 
-    if worker['balrog-action'] == 'submit-locale':
+    if worker['balrog-action'] == 'submit-locale' or worker['balrog-action'] == 'v2-submit-locale':
         task_def['payload'] = {
             'upstreamArtifacts':  worker['upstream-artifacts'],
             'suffixes': worker['suffixes'],
@@ -1079,7 +1079,8 @@ def build_balrog_payload(config, task, task_def):
                      'complete-mar-bouncer-product-pattern'):
             if prop in worker:
                 task_def['payload'][prop.replace('-', '_')] = worker[prop]
-        if worker['balrog-action'] == 'submit-toplevel':
+        if worker['balrog-action'] == 'submit-toplevel' or \
+                worker['balrog-action'] == 'v2-submit-toplevel':
             task_def['payload'].update({
                 'app_version': release_config['appVersion'],
                 'archive_domain': worker['archive-domain'],
diff --git a/taskcluster/taskgraph/util/scriptworker.py b/taskcluster/taskgraph/util/scriptworker.py
index c1df1594381c..a49ed03ceb22 100644
--- a/taskcluster/taskgraph/util/scriptworker.py
+++ b/taskcluster/taskgraph/util/scriptworker.py
@@ -118,7 +118,13 @@ BEETMOVER_ACTION_SCOPES = {
 
 
 """Known balrog actions."""
-BALROG_ACTIONS = ('submit-locale', 'submit-toplevel', 'schedule')
+BALROG_ACTIONS = (
+    'submit-locale',
+    'submit-toplevel',
+    'schedule',
+    'v2-submit-locale',
+    'v2-submit-toplevel'
+)
 
 """Map balrog scope aliases to sets of projects.