--- a/taskcluster/ci/source-test/kind.yml
+++ b/taskcluster/ci/source-test/kind.yml
@@ -13,9 +13,11 @@ jobs-from:
     - python-tests.yml
     - mozlint.yml
     - doc.yml
     - webidl.yml
 
 # This is used by run-task based tasks to lookup which build task it
 # should depend on based on its own platform.
 dependent-build-platforms:
-    linux64.*: build-linux64/opt
+    linux64.*:
+        label: build-linux64/opt
+        target-name: target.tar.bz2

--- a/taskcluster/taskgraph/transforms/job/common.py
+++ b/taskcluster/taskgraph/transforms/job/common.py
@@ -68,26 +68,21 @@ def add_build_dependency(config, job, ta
     matches = keymatch(build_labels, key)
     if not matches:
         raise Exception("No build platform found for '{}'. "
                         "Define 'dependent-build-platforms' in the kind config.".format(key))
 
     if len(matches) > 1:
         raise Exception("More than one build platform found for '{}'.".format(key))
 
-    label = matches[0]
+    label = matches[0]['label']
+    target = matches[0]['target-name']
     deps = taskdesc.setdefault('dependencies', {})
     deps.update({'build': label})
 
-    if 'macosx' in label:
-        target = 'target.dmg'
-    elif 'android' in label:
-        target = 'target.apk'
-    else:
-        target = 'target.tar.bz2'
     build_artifact = 'public/build/{}'.format(target)
     installer_url = ARTIFACT_URL.format('<build>', build_artifact)
 
     env = taskdesc['worker'].setdefault('env', {})
     env.update({'GECKO_INSTALLER_URL': {'task-reference': installer_url}})
 
 
 def support_vcs_checkout(config, job, taskdesc):