diff --git a/taskcluster/ci/beetmover-repackage/kind.yml b/taskcluster/ci/beetmover-repackage/kind.yml
index b7d4ce6eff..4d59d21e27 100644
--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -14,6 +14,7 @@ transforms:
 
 kind-dependencies:
     - repackage-signing
+    - repackage-signing-l10n
 
 only-for-build-platforms:
     - linux-nightly/opt
diff --git a/taskcluster/ci/nightly-l10n/kind.yml b/taskcluster/ci/nightly-l10n/kind.yml
index 8ee3c6fa57..7464ad80c0 100644
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -2,7 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-loader: taskgraph.loader.single_dep:loader
+loader: taskgraph.loader.multi_dep:loader
+
+group-by: platform
 
 transforms:
     - taskgraph.transforms.l10n:transforms
@@ -12,6 +14,9 @@ transforms:
 
 kind-dependencies:
     - build
+    - build-signing
+    - repackage
+    - repackage-signing
     - toolchain
 
 only-for-build-platforms:
diff --git a/taskcluster/ci/repackage-signing-l10n/kind.yml b/taskcluster/ci/repackage-signing-l10n/kind.yml
new file mode 100644
index 0000000000..269baf9ecf
--- /dev/null
+++ b/taskcluster/ci/repackage-signing-l10n/kind.yml
@@ -0,0 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+loader: taskgraph.loader.single_dep:loader
+
+transforms:
+    - taskgraph.transforms.name_sanity:transforms
+    - taskgraph.transforms.repackage_signing:transforms
+    - taskgraph.transforms.task:transforms
+    - comm_taskgraph:remove_widevine_and_stub_installer
+
+
+kind-dependencies:
+    - repackage-l10n
+
+only-for-build-platforms:
+    - linux-nightly/opt
+    - linux64-nightly/opt
+    - macosx64-nightly/opt
+    - win32-nightly/opt
+    - win64-nightly/opt
diff --git a/taskcluster/ci/repackage-signing/kind.yml b/taskcluster/ci/repackage-signing/kind.yml
index 0fd3443949..71b83bf991 100644
--- a/taskcluster/ci/repackage-signing/kind.yml
+++ b/taskcluster/ci/repackage-signing/kind.yml
@@ -13,7 +13,6 @@ transforms:
 
 kind-dependencies:
     - repackage
-    - repackage-l10n
 
 only-for-build-platforms:
     - linux-nightly/opt