diff --git a/taskcluster/ci/beetmover-geckoview/kind.yml b/taskcluster/ci/beetmover-geckoview/kind.yml
index 154c240d02dc..9fe3e58519e9 100644
--- a/taskcluster/ci/beetmover-geckoview/kind.yml
+++ b/taskcluster/ci/beetmover-geckoview/kind.yml
@@ -16,17 +16,11 @@ only-for-attributes:
     - nightly
 
 not-for-build-platforms:
-    - linux-nightly/opt
     - linux-shippable/opt
-    - linux64-nightly/opt
     - linux64-shippable/opt
-    - macosx64-nightly/opt
     - macosx64-shippable/opt
-    - win32-nightly/opt
     - win32-shippable/opt
-    - win64-nightly/opt
     - win64-shippable/opt
-    - win64-aarch64-nightly/opt
     - win64-aarch64-shippable/opt
     - linux-devedition/opt
     - linux64-devedition/opt
diff --git a/taskcluster/ci/beetmover-repackage/kind.yml b/taskcluster/ci/beetmover-repackage/kind.yml
index 4c9917a8cb13..3e0a83659103 100644
--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -38,12 +38,6 @@ only-for-build-platforms:
     - win32-shippable/opt
     - win64-shippable/opt
     - win64-aarch64-shippable/opt
-    - linux-nightly/opt
-    - linux64-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
-    - win64-aarch64-nightly/opt
     - linux-devedition/opt
     - linux64-devedition/opt
     - macosx64-devedition/opt
diff --git a/taskcluster/ci/mar-signing-l10n/kind.yml b/taskcluster/ci/mar-signing-l10n/kind.yml
index 5afa577f5657..971bd62990c6 100644
--- a/taskcluster/ci/mar-signing-l10n/kind.yml
+++ b/taskcluster/ci/mar-signing-l10n/kind.yml
@@ -19,18 +19,12 @@ only-for-build-platforms:
     - win32-shippable/opt
     - win64-shippable/opt
     - win64-aarch64-shippable/opt
-    - linux-nightly/opt
-    - linux-devedition/opt
-    - linux64-nightly/opt
-    - linux64-devedition/opt
     - linux64-asan-reporter-nightly/opt
-    - macosx64-nightly/opt
+    - linux-devedition/opt
+    - linux64-devedition/opt
     - macosx64-devedition/opt
-    - win32-nightly/opt
     - win32-devedition/opt
-    - win64-nightly/opt
     - win64-devedition/opt
-    - win64-aarch64-nightly/opt
     - win64-aarch64-devedition/opt
 
 job-template:
diff --git a/taskcluster/ci/mar-signing/kind.yml b/taskcluster/ci/mar-signing/kind.yml
index f427bb14949c..433dc7c66847 100644
--- a/taskcluster/ci/mar-signing/kind.yml
+++ b/taskcluster/ci/mar-signing/kind.yml
@@ -19,17 +19,11 @@ only-for-build-platforms:
     - win32-shippable/opt
     - win64-shippable/opt
     - win64-aarch64-shippable/opt
-    - linux-nightly/opt
     - linux-devedition/opt
-    - linux64-nightly/opt
     - linux64-devedition/opt
-    - macosx64-nightly/opt
     - macosx64-devedition/opt
-    - win32-nightly/opt
     - win32-devedition/opt
-    - win64-nightly/opt
     - win64-devedition/opt
-    - win64-aarch64-nightly/opt
     - win64-aarch64-devedition/opt
     - linux64-asan-reporter-nightly/opt
     - win64-asan-reporter-nightly/opt
diff --git a/taskcluster/ci/partials/kind.yml b/taskcluster/ci/partials/kind.yml
index 0c0cea50a97a..fc9c90d1cc7f 100644
--- a/taskcluster/ci/partials/kind.yml
+++ b/taskcluster/ci/partials/kind.yml
@@ -19,22 +19,16 @@ only-for-attributes:
 
 only-for-build-platforms:
     - macosx64-shippable/opt
-    - macosx64-nightly/opt
     - macosx64-devedition/opt
     - win32-shippable/opt
-    - win32-nightly/opt
     - win32-devedition/opt
     - win64-shippable/opt
-    - win64-nightly/opt
     - win64-devedition/opt
     - win64-aarch64-shippable/opt
-    - win64-aarch64-nightly/opt
     - win64-aarch64-devedition/opt
     - linux-shippable/opt
-    - linux-nightly/opt
     - linux-devedition/opt
     - linux64-shippable/opt
-    - linux64-nightly/opt
     - linux64-devedition/opt
 
 job-template:
diff --git a/taskcluster/ci/release-eme-free-repack-beetmover-checksums/kind.yml b/taskcluster/ci/release-eme-free-repack-beetmover-checksums/kind.yml
index 08707d45aef2..7d64666b30c4 100644
--- a/taskcluster/ci/release-eme-free-repack-beetmover-checksums/kind.yml
+++ b/taskcluster/ci/release-eme-free-repack-beetmover-checksums/kind.yml
@@ -16,9 +16,6 @@ only-for-build-platforms:
     - macosx64-shippable/opt
     - win32-shippable/opt
     - win64-shippable/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
 
 job-template:
     shipping-phase: promote
diff --git a/taskcluster/ci/release-eme-free-repack-beetmover/kind.yml b/taskcluster/ci/release-eme-free-repack-beetmover/kind.yml
index 8f15407c1ed5..b13d5b839572 100644
--- a/taskcluster/ci/release-eme-free-repack-beetmover/kind.yml
+++ b/taskcluster/ci/release-eme-free-repack-beetmover/kind.yml
@@ -16,9 +16,6 @@ only-for-build-platforms:
     - macosx64-shippable/opt
     - win32-shippable/opt
     - win64-shippable/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
 
 job-template:
     shipping-phase: promote
diff --git a/taskcluster/ci/release-eme-free-repack-repackage-signing/kind.yml b/taskcluster/ci/release-eme-free-repack-repackage-signing/kind.yml
index d1d15e5b0a86..c45627776451 100644
--- a/taskcluster/ci/release-eme-free-repack-repackage-signing/kind.yml
+++ b/taskcluster/ci/release-eme-free-repack-repackage-signing/kind.yml
@@ -14,8 +14,5 @@ kind-dependencies:
 
 only-for-build-platforms:
     - win32-shippable/opt
-    - win32-nightly/opt
     - win64-shippable/opt
-    - win64-nightly/opt
     - macosx64-shippable/opt
-    - macosx64-nightly/opt
diff --git a/taskcluster/ci/release-eme-free-repack-repackage/kind.yml b/taskcluster/ci/release-eme-free-repack-repackage/kind.yml
index 1cf3f95c3dd7..95f0c15ad231 100644
--- a/taskcluster/ci/release-eme-free-repack-repackage/kind.yml
+++ b/taskcluster/ci/release-eme-free-repack-repackage/kind.yml
@@ -18,11 +18,8 @@ kind-dependencies:
 
 only-for-build-platforms:
     - macosx64-shippable/opt
-    - macosx64-nightly/opt
     - win32-shippable/opt
-    - win32-nightly/opt
     - win64-shippable/opt
-    - win64-nightly/opt
 
 job-template:
     mozharness:
diff --git a/taskcluster/ci/release-eme-free-repack-signing/kind.yml b/taskcluster/ci/release-eme-free-repack-signing/kind.yml
index 173b73672b4e..253aa51c5ed4 100644
--- a/taskcluster/ci/release-eme-free-repack-signing/kind.yml
+++ b/taskcluster/ci/release-eme-free-repack-signing/kind.yml
@@ -20,7 +20,6 @@ primary-dependency: release-eme-free-repack-notarization-part-1
 
 only-for-build-platforms:
     - macosx64-shippable/opt
-    - macosx64-nightly/opt
 
 job-template:
     shipping-product: firefox
diff --git a/taskcluster/ci/release-partner-repack-beetmover/kind.yml b/taskcluster/ci/release-partner-repack-beetmover/kind.yml
index e71c233171d3..d989eb573753 100644
--- a/taskcluster/ci/release-partner-repack-beetmover/kind.yml
+++ b/taskcluster/ci/release-partner-repack-beetmover/kind.yml
@@ -20,12 +20,6 @@ only-for-build-platforms:
     - win32-shippable/opt
     - win64-shippable/opt
     - win64-aarch64-shippable/opt
-    - linux-nightly/opt
-    - linux64-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
-    - win64-aarch64-nightly/opt
 
 job-template:
     shipping-phase: promote
diff --git a/taskcluster/ci/release-partner-repack-chunking-dummy/kind.yml b/taskcluster/ci/release-partner-repack-chunking-dummy/kind.yml
index e33ac415c079..fb9b049c9886 100644
--- a/taskcluster/ci/release-partner-repack-chunking-dummy/kind.yml
+++ b/taskcluster/ci/release-partner-repack-chunking-dummy/kind.yml
@@ -24,8 +24,6 @@ kind-dependencies:
 only-for-build-platforms:
     - linux-shippable/opt
     - linux64-shippable/opt
-    - linux-nightly/opt
-    - linux64-nightly/opt
 
 job-template:
     shipping-phase: promote
diff --git a/taskcluster/ci/release-partner-repack-repackage-signing/kind.yml b/taskcluster/ci/release-partner-repack-repackage-signing/kind.yml
index cb076e6a9921..0a0722fb5082 100644
--- a/taskcluster/ci/release-partner-repack-repackage-signing/kind.yml
+++ b/taskcluster/ci/release-partner-repack-repackage-signing/kind.yml
@@ -21,9 +21,3 @@ only-for-build-platforms:
     - win32-shippable/opt
     - win64-shippable/opt
     - win64-aarch64-shippable/opt
-    - linux-nightly/opt
-    - linux64-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
-    - win64-aarch64-nightly/opt
diff --git a/taskcluster/ci/release-partner-repack-repackage/kind.yml b/taskcluster/ci/release-partner-repack-repackage/kind.yml
index feb0e45243a4..d6dfdb8f730f 100644
--- a/taskcluster/ci/release-partner-repack-repackage/kind.yml
+++ b/taskcluster/ci/release-partner-repack-repackage/kind.yml
@@ -21,10 +21,6 @@ only-for-build-platforms:
     - win32-shippable/opt
     - win64-shippable/opt
     - win64-aarch64-shippable/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
-    - win64-aarch64-nightly/opt
 
 job-template:
     mozharness:
diff --git a/taskcluster/ci/release-partner-repack-signing/kind.yml b/taskcluster/ci/release-partner-repack-signing/kind.yml
index 0d4a84923c44..598f4b9b936c 100644
--- a/taskcluster/ci/release-partner-repack-signing/kind.yml
+++ b/taskcluster/ci/release-partner-repack-signing/kind.yml
@@ -19,7 +19,6 @@ kind-dependencies:
 primary-dependency: release-partner-repack-notarization-part-1
 
 only-for-build-platforms:
-    - macosx64-nightly/opt
     - macosx64-shippable/opt
 
 job-template:
diff --git a/taskcluster/ci/release-push-langpacks/kind.yml b/taskcluster/ci/release-push-langpacks/kind.yml
index bcd0319208a4..97b6f29cc7df 100644
--- a/taskcluster/ci/release-push-langpacks/kind.yml
+++ b/taskcluster/ci/release-push-langpacks/kind.yml
@@ -38,7 +38,6 @@ job-template:
                 mozilla-beta:
                     by-platform:
                         # ja-JP-mac is only langpack on mac, and is unlisted always
-                        macosx64-nightly.*: unlisted
                         macosx64-shippable.*: unlisted
                         macosx64-devedition.*: unlisted
                         linux.*-devedition.*: unlisted
diff --git a/taskcluster/ci/repackage-l10n/kind.yml b/taskcluster/ci/repackage-l10n/kind.yml
index 2471927c9149..7d678561d2b4 100644
--- a/taskcluster/ci/repackage-l10n/kind.yml
+++ b/taskcluster/ci/repackage-l10n/kind.yml
@@ -22,12 +22,6 @@ only-for-build-platforms:
     - win32-shippable/opt
     - win64-shippable/opt
     - win64-aarch64-shippable/opt
-    - linux-nightly/opt
-    - linux64-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
-    - win64-aarch64-nightly/opt
     - linux-devedition/opt
     - linux64-devedition/opt
     - macosx64-devedition/opt
diff --git a/taskcluster/ci/repackage-msi/kind.yml b/taskcluster/ci/repackage-msi/kind.yml
index 0042af4093f9..8575333858f4 100644
--- a/taskcluster/ci/repackage-msi/kind.yml
+++ b/taskcluster/ci/repackage-msi/kind.yml
@@ -17,9 +17,7 @@ kind-dependencies:
 
 only-for-build-platforms:
     - win32-shippable/opt
-    - win32-nightly/opt
     - win64-shippable/opt
-    - win64-nightly/opt
     - win32-devedition/opt
     - win64-devedition/opt
 
diff --git a/taskcluster/ci/repackage-signing-l10n/kind.yml b/taskcluster/ci/repackage-signing-l10n/kind.yml
index 76bca165cea9..1974425f295b 100644
--- a/taskcluster/ci/repackage-signing-l10n/kind.yml
+++ b/taskcluster/ci/repackage-signing-l10n/kind.yml
@@ -15,14 +15,11 @@ kind-dependencies:
 
 only-for-build-platforms:
     - win32-shippable/opt
-    - win32-nightly/opt
     - win32-devedition/opt
     - win32/opt
     - win64-shippable/opt
-    - win64-nightly/opt
     - win64-devedition/opt
     - win64/opt
     - win64-aarch64-shippable/opt
-    - win64-aarch64-nightly/opt
     - win64-aarch64-devedition/opt
     - win64-asan-reporter-nightly/opt
diff --git a/taskcluster/ci/repackage-signing-msi/kind.yml b/taskcluster/ci/repackage-signing-msi/kind.yml
index b1df2c08882f..fa84b7c11977 100644
--- a/taskcluster/ci/repackage-signing-msi/kind.yml
+++ b/taskcluster/ci/repackage-signing-msi/kind.yml
@@ -14,10 +14,8 @@ kind-dependencies:
 
 only-for-build-platforms:
     - win32-shippable/opt
-    - win32-nightly/opt
     - win32-devedition/opt
     - win32/opt
     - win64-shippable/opt
-    - win64-nightly/opt
     - win64-devedition/opt
     - win64/opt
diff --git a/taskcluster/ci/repackage-signing/kind.yml b/taskcluster/ci/repackage-signing/kind.yml
index fcae870faa3c..cdc9299577f1 100644
--- a/taskcluster/ci/repackage-signing/kind.yml
+++ b/taskcluster/ci/repackage-signing/kind.yml
@@ -14,15 +14,12 @@ kind-dependencies:
     - repackage
 
 only-for-build-platforms:
-    - win32-nightly/opt
     - win32-devedition/opt
     - win32-pgo/opt
     - win32-shippable/opt
-    - win64-nightly/opt
     - win64-devedition/opt
     - win64-pgo/opt
     - win64-shippable/opt
-    - win64-aarch64-nightly/opt
     - win64-aarch64-shippable/opt
     - win64-aarch64-devedition/opt
     - win64-asan-reporter-nightly/opt
diff --git a/taskcluster/ci/repackage/kind.yml b/taskcluster/ci/repackage/kind.yml
index 7f168af8d85d..7d62499581fe 100644
--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -17,29 +17,23 @@ kind-dependencies:
 
 only-for-build-platforms:
     - linux-shippable/opt
-    - linux-nightly/opt
     - linux-devedition/opt
     - linux/opt
     - linux64-shippable/opt
-    - linux64-nightly/opt
     - linux64-devedition/opt
     - linux64-asan-reporter-nightly/opt
     - linux64/opt
     - linux64-pgo/opt
     - macosx64-shippable/opt
-    - macosx64-nightly/opt
     - macosx64-devedition/opt
     - macosx64/opt
     - win32-shippable/opt
-    - win32-nightly/opt
     - win32-devedition/opt
     - win32/opt
     - win32-pgo/opt
     - win64-shippable/opt
-    - win64-nightly/opt
     - win64-devedition/opt
     - win64-aarch64-shippable/opt
-    - win64-aarch64-nightly/opt
     - win64-aarch64-devedition/opt
     - win64/opt
     - win64-pgo/opt