diff --git a/automation/taskcluster/decision_task.py b/automation/taskcluster/decision_task.py
index 4e9e1be83..fca6a6075 100644
--- a/automation/taskcluster/decision_task.py
+++ b/automation/taskcluster/decision_task.py
@@ -187,8 +187,8 @@ def nightly_to_production_app(is_staging, version_name):
         build_task_id,
         taskcluster_apk_paths,
         channel='production',  # Since we're publishing to the "production" app, we need to sign for production
-        index_channel='nightly',
         is_staging=is_staging,
+        publish_to_index=False,
     )
 
     push_task_id = taskcluster.slugId()
diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py
index c5efb3bb7..8fd03e177 100644
--- a/automation/taskcluster/lib/tasks.py
+++ b/automation/taskcluster/lib/tasks.py
@@ -468,20 +468,21 @@ class TaskBuilder(object):
         )
 
     def craft_release_signing_task(
-        self, build_task_id, apk_paths, channel, is_staging, index_channel=None
+        self, build_task_id, apk_paths, channel, is_staging, publish_to_index=True
     ):
-        index_channel = index_channel or channel
-        staging_prefix = '.staging' if is_staging else ''
-
-        routes = [
-            "index.project.mobile.fenix.v2{}.{}.{}.{}.{}.latest".format(
-                staging_prefix, index_channel, self.date.year, self.date.month, self.date.day
-            ),
-            "index.project.mobile.fenix.v2{}.{}.{}.{}.{}.revision.{}".format(
-                staging_prefix, index_channel, self.date.year, self.date.month, self.date.day, self.commit
-            ),
-            "index.project.mobile.fenix.v2{}.{}.latest".format(staging_prefix, index_channel),
-        ]
+        if publish_to_index:
+            staging_prefix = '.staging' if is_staging else ''
+            routes = [
+                "index.project.mobile.fenix.v2{}.{}.{}.{}.{}.latest".format(
+                    staging_prefix, channel, self.date.year, self.date.month, self.date.day
+                ),
+                "index.project.mobile.fenix.v2{}.{}.{}.{}.{}.revision.{}".format(
+                    staging_prefix, channel, self.date.year, self.date.month, self.date.day, self.commit
+                ),
+                "index.project.mobile.fenix.v2{}.{}.latest".format(staging_prefix, channel),
+            ]
+        else:
+            routes = []
 
         capitalized_channel = upper_case_first_letter(channel)
         return self._craft_signing_task(