diff --git a/taskcluster/ci/beetmover-repackage/kind.yml b/taskcluster/ci/beetmover-repackage/kind.yml
index 1d7ee419c286..ebc7bd52a04a 100644
--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -26,8 +26,8 @@ kind-dependencies:
     - repackage-signing-msi
 
 primary-dependency:
-    - repackage-signing-l10n
-    - repackage-signing
+    - repackage
+    - repackage-l10n
 
 only-for-build-platforms:
     - linux-nightly/opt
diff --git a/taskcluster/ci/repackage-signing-l10n/kind.yml b/taskcluster/ci/repackage-signing-l10n/kind.yml
index 4fc1c04f8760..a127f8e08ee4 100644
--- a/taskcluster/ci/repackage-signing-l10n/kind.yml
+++ b/taskcluster/ci/repackage-signing-l10n/kind.yml
@@ -14,13 +14,6 @@ kind-dependencies:
    - repackage-l10n
 
 only-for-build-platforms:
-   - linux-nightly/opt
-   - linux-devedition-nightly/opt
-   - linux64-nightly/opt
-   - linux64-devedition-nightly/opt
-   - linux64-asan-reporter-nightly/opt
-   - macosx64-nightly/opt
-   - macosx64-devedition-nightly/opt
    - win32-nightly/opt
    - win32-devedition-nightly/opt
    - win32/opt
diff --git a/taskcluster/ci/repackage-signing/kind.yml b/taskcluster/ci/repackage-signing/kind.yml
index ab7aaa9bbe15..607086a4a953 100644
--- a/taskcluster/ci/repackage-signing/kind.yml
+++ b/taskcluster/ci/repackage-signing/kind.yml
@@ -14,13 +14,6 @@ kind-dependencies:
    - repackage
 
 only-for-build-platforms:
-   - linux-nightly/opt
-   - linux-devedition-nightly/opt
-   - linux64-nightly/opt
-   - linux64-devedition-nightly/opt
-   - linux64-asan-reporter-nightly/opt
-   - macosx64-nightly/opt
-   - macosx64-devedition-nightly/opt
    - win32-nightly/opt
    - win32-devedition-nightly/opt
    - win32/opt
diff --git a/taskcluster/taskgraph/transforms/beetmover_repackage.py b/taskcluster/taskgraph/transforms/beetmover_repackage.py
index 48eddaa9533d..a4d50c42a463 100644
--- a/taskcluster/taskgraph/transforms/beetmover_repackage.py
+++ b/taskcluster/taskgraph/transforms/beetmover_repackage.py
@@ -129,8 +129,6 @@ UPSTREAM_ARTIFACT_REPACKAGE_PATHS = [
 # with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
 # See example in bug 1348286
 UPSTREAM_ARTIFACT_SIGNED_REPACKAGE_PATHS = [
-    'target.complete.mar',
-    'target.bz2.complete.mar',
     'target.installer.exe',
     'target.stub-installer.exe',
 ]
@@ -197,7 +195,6 @@ def make_task_description(config, jobs):
 
         upstream_deps = job['dependent-tasks']
 
-        # TODO fix the upstreamArtifact generation to not need this?
         signing_name = "build-signing"
         build_name = "build"
         repackage_name = "repackage"
@@ -211,13 +208,14 @@ def make_task_description(config, jobs):
         dependencies = {
             "build": upstream_deps[build_name],
             "repackage": upstream_deps[repackage_name],
-            "repackage-signing": upstream_deps[repackage_signing_name],
             "signing": upstream_deps[signing_name],
         }
         if 'partials-signing' in upstream_deps:
             dependencies['partials-signing'] = upstream_deps['partials-signing']
         if msi_signing_name in upstream_deps:
             dependencies[msi_signing_name] = upstream_deps[msi_signing_name]
+        if repackage_signing_name in upstream_deps:
+            dependencies["repackage-signing"] = upstream_deps[repackage_signing_name]
 
         attributes = copy_attributes_from_dependent_job(dep_job)
         if job.get('locale'):
diff --git a/taskcluster/taskgraph/transforms/repackage_signing.py b/taskcluster/taskgraph/transforms/repackage_signing.py
index f3f923b7bc01..0b8b12d430df 100644
--- a/taskcluster/taskgraph/transforms/repackage_signing.py
+++ b/taskcluster/taskgraph/transforms/repackage_signing.py
@@ -33,8 +33,6 @@ repackage_signing_description_schema = schema.extend({
 })
 
 SIGNING_FORMATS = {
-    'target.complete.mar': ["autograph_hash_only_mar384"],
-    'target.bz2.complete.mar': ["mar"],
     "target.installer.exe": ["sha2signcode"],
     "target.stub-installer.exe": ["sha2signcodestub"],
     "target.installer.msi": ["sha2signcode"],