diff --git a/taskcluster/ci/release-flatpak-push/kind.yml b/taskcluster/ci/release-flatpak-push/kind.yml
index edd65c953e26..27f5ebf3ec41 100644
--- a/taskcluster/ci/release-flatpak-push/kind.yml
+++ b/taskcluster/ci/release-flatpak-push/kind.yml
@@ -37,5 +37,6 @@ job-defaults:
 jobs:
     firefox:
         shipping-product: firefox
+        flathub-scope: "flathub:firefox"
         treeherder:
             symbol: Flatpak(push)
diff --git a/taskcluster/ci/release-secondary-flatpak-push/kind.yml b/taskcluster/ci/release-secondary-flatpak-push/kind.yml
index 379f2326dd05..7f770d4ee561 100644
--- a/taskcluster/ci/release-secondary-flatpak-push/kind.yml
+++ b/taskcluster/ci/release-secondary-flatpak-push/kind.yml
@@ -33,5 +33,6 @@ job-defaults:
 jobs:
     firefox-rc:
         shipping-product: firefox
+        flathub-scope: "flathub:firefox"
         treeherder:
             symbol: Flatpak(push-beta)
diff --git a/taskcluster/gecko_taskgraph/transforms/release_flatpak_push.py b/taskcluster/gecko_taskgraph/transforms/release_flatpak_push.py
index 8a336502e6ab..50ba0d92171e 100644
--- a/taskcluster/gecko_taskgraph/transforms/release_flatpak_push.py
+++ b/taskcluster/gecko_taskgraph/transforms/release_flatpak_push.py
@@ -26,6 +26,7 @@ push_flatpak_description_schema = Schema(
         Optional("scopes"): [str],
         Required("shipping-phase"): task_description_schema["shipping-phase"],
         Required("shipping-product"): task_description_schema["shipping-product"],
+        Required("flathub-scope"): str,
         Optional("extra"): task_description_schema["extra"],
         Optional("attributes"): task_description_schema["attributes"],
     }
@@ -61,7 +62,7 @@ def make_task_description(config, jobs):
             job.setdefault("scopes", []).append(
                 add_scope_prefix(
                     config,
-                    "flathub:firefox:{}".format(job["worker"]["channel"]),
+                    "{}:{}".format(job.pop("flathub-scope"), job["worker"]["channel"]),
                 )
             )