diff --git a/src/scriptworker/constants.py b/src/scriptworker/constants.py
index ea5b3c68..d6a02c67 100644
--- a/src/scriptworker/constants.py
+++ b/src/scriptworker/constants.py
@@ -539,8 +539,10 @@
                             "project:releng:signing:cert:release-signing": "all-release-branches",
                             "project:releng:signing:cert:production-signing": "all-production-branches",
                             "project:releng:signing:cert:fennec-production-signing": "beta-or-release",
-                            "project:releng:flathub:firefox:beta": "beta-or-release",  # Needed on release for RCs
+                            "project:releng:flathub:firefox:beta": "beta",
                             "project:releng:flathub:firefox:stable": "release",
+                            "project:releng:flathub:firefox:beta:org.mozilla.firefox": "beta",
+                            "project:releng:flathub:firefox:stable:org.mozilla.firefox": "release",
                             "project:releng:googleplay:product:focus-android": "all-production-branches",
                             "project:releng:googleplay:product:fenix": "all-production-branches",
                             "project:releng:ship-it:production": "all-production-branches",
@@ -594,6 +596,11 @@
                             "project:comm:thunderbird:releng:signing:cert:release-signing": "all-release-branches",
                             "project:comm:thunderbird:releng:flathub:beta": "beta",
                             "project:comm:thunderbird:releng:flathub:stable": "release-or-esr",
+                            "project:comm:thunderbird:releng:flathub:beta:org.mozilla.Thunderbird": "beta",
+                            "project:comm:thunderbird:releng:flathub:stable:org.mozilla.Thunderbird": "release-or-esr",
+                            "project:comm:thunderbird:releng:flathub:beta:org.mozilla.thunderbird": "beta",
+                            "project:comm:thunderbird:releng:flathub:stable:org.mozilla.thunderbird": "release",
+                            "project:comm:thunderbird:releng:flathub:stable:org.mozilla.thunderbird_esr": "esr",
                             "project:comm:thunderbird:releng:microsoftstore:beta": "beta",
                             "project:comm:thunderbird:releng:microsoftstore:release": "release",
                             "project:comm:thunderbird:releng:microsoftstore:esr": "esr",