diff --git a/automation/taskcluster/decision_task.py b/automation/taskcluster/decision_task.py
index 0798c34ef..4e9e1be83 100644
--- a/automation/taskcluster/decision_task.py
+++ b/automation/taskcluster/decision_task.py
@@ -145,6 +145,27 @@ def release(channel, engine, is_staging, version_name):
     return (build_tasks, signing_tasks, push_tasks)
 
 
+def release_as_fennec(is_staging, version_name):
+    variant = get_variant('fennecProduction', 'geckoBeta')
+    channel = 'fennec-production'
+
+    build_tasks = {}
+    signing_tasks = {}
+
+    build_task_id = taskcluster.slugId()
+    build_tasks[build_task_id] = BUILDER.craft_assemble_release_task(variant, channel, is_staging, version_name)
+
+    signing_task_id = taskcluster.slugId()
+    signing_tasks[signing_task_id] = BUILDER.craft_release_signing_task(
+        build_task_id,
+        variant.upstream_artifacts(),
+        channel,
+        is_staging,
+    )
+
+    return (build_tasks, signing_tasks)
+
+
 def nightly_to_production_app(is_staging, version_name):
     # Since the Fenix nightly was launched, we've pushed it to the production app "org.mozilla.fenix" on the
     # "nightly" track. We're moving towards having each channel be published to its own app, but we need to
@@ -159,7 +180,7 @@ def nightly_to_production_app(is_staging, version_name):
 
     build_task_id = taskcluster.slugId()
     build_tasks[build_task_id] = BUILDER.craft_assemble_release_task(
-        variant, 'nightlyLegacy', is_staging, version_name)
+        variant, 'nightly-legacy', is_staging, version_name)
 
     signing_task_id = taskcluster.slugId()
     signing_tasks[signing_task_id] = BUILDER.craft_release_signing_task(
@@ -218,9 +239,11 @@ if __name__ == "__main__":
     elif command == 'raptor':
         ordered_groups_of_tasks = raptor(result.staging)
     elif command == 'nightly':
-        nightly_version = datetime.datetime.now().strftime('Nightly %y%m%d %H:%M')
+        now = datetime.datetime.now().strftime('%y%m%d %H:%M')
+        nightly_version = 'Nightly {}'.format(now)
         ordered_groups_of_tasks = release('nightly', 'geckoNightly', result.staging, nightly_version) \
             + nightly_to_production_app(result.staging, nightly_version)
+        ordered_groups_of_tasks += release_as_fennec(result.staging, 'Signed-as-Fennec Nightly {}'.format(now))
     elif command == 'github-release':
         version = result.tag[1:]  # remove prefixed "v"
         beta_semver = re.compile(r'^v\d+\.\d+\.\d+-beta\.\d+$')