gistfile1.txt

diff --git a/taskcluster/ci/bouncer-locations/kind.yml b/taskcluster/ci/bouncer-locations/kind.yml
--- a/taskcluster/ci/bouncer-locations/kind.yml
+++ b/taskcluster/ci/bouncer-locations/kind.yml
@@ -3,16 +3,20 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 loader: taskgraph.loader.transform:loader
 
 transforms:
    - taskgraph.transforms.bouncer_locations:transforms
    - taskgraph.transforms.task:transforms
 
+kind-dependencies:
+   - build-signing
+   - nightly-l10n-signing
+
 job-defaults:
    description: nightly bouncer locations job
    attributes:
       build_platform: linux64-nightly
       nightly: true
    worker-type:
       by-project:
          mozilla-central: scriptworker-prov-v1/bouncer-v1
diff --git a/taskcluster/ci/nightly-l10n/kind.yml b/taskcluster/ci/nightly-l10n/kind.yml
--- a/taskcluster/ci/nightly-l10n/kind.yml
+++ b/taskcluster/ci/nightly-l10n/kind.yml
@@ -36,17 +36,19 @@ job-template:
    description:
       by-build-platform:
          default: Localization
          android-api-16-nightly: Single Locale Repack
    locales-file:
       by-build-platform:
          default: browser/locales/l10n-changesets.json
          android-api-16-nightly: mobile/locales/l10n-changesets.json
-   locales-per-chunk: 5
+   # Bug 1489405 - bumping this from 5 to 6 in order to accommodate
+   # bouncer-locations on nightlies until we have shippable-builds.
+   locales-per-chunk: 6
    run-on-projects: ['release']
    attributes:
       shipping_phase: promote
    ignore-locales:
       by-build-platform:
          # OSX has a special locale for japanese
          macosx64.*: [ja]
          default: [ja-JP-mac]
diff --git a/taskcluster/taskgraph/transforms/bouncer_locations.py b/taskcluster/taskgraph/transforms/bouncer_locations.py
--- a/taskcluster/taskgraph/transforms/bouncer_locations.py
+++ b/taskcluster/taskgraph/transforms/bouncer_locations.py
@@ -23,11 +23,17 @@ def make_task_worker(config, jobs):
         resolve_keyed_by(
             job, 'scopes', item_name=job['name'], project=config.params['project']
         )
         resolve_keyed_by(
             job, 'bouncer-products', item_name=job['name'], project=config.params['project']
         )
 
         job['worker']['bouncer-products'] = job['bouncer-products']
+        del job['bouncer-products']
 
-        del job['bouncer-products']
+        # chain the breakpoint as dependency to this task
+        dependencies = {}
+        for dep_task in config.kind_dependencies_tasks:
+            dependencies[dep_task.kind] = dep_task.label
+
+        job.setdefault('dependencies', {}).update(dependencies)
         yield job