diff --git a/.cron.yml b/.cron.yml
index e0336e05676a84bc3b194f85ba0f265a928dedc5..1e3e3a3b31961b9a1e6fb6ed914144f51786793b 100644
--- a/.cron.yml
+++ b/.cron.yml
@@ -106,7 +106,7 @@ jobs:
       job:
           type: decision-task
           treeherder-symbol: Rel
-          target-tasks-method: bouncer_check
+          target-tasks-method: cron_bouncer_check
       run-on-projects:
           - mozilla-beta
           - mozilla-release
diff --git a/taskcluster/ci/bouncer-check/kind.yml b/taskcluster/ci/cron-bouncer-check/kind.yml
similarity index 99%
rename from taskcluster/ci/bouncer-check/kind.yml
rename to taskcluster/ci/cron-bouncer-check/kind.yml
index ada20fb1a6864bc33456a890bdd7c2d4ae96ed46..be862ff396d61f090c3267ed5bc852f43a980e5d 100644
--- a/taskcluster/ci/bouncer-check/kind.yml
+++ b/taskcluster/ci/cron-bouncer-check/kind.yml
@@ -13,7 +13,6 @@ job-defaults:
     name: bouncer-check
     description: bouncer check
     run-on-projects: []  # to make sure this never runs as part of CI
-    shipping-phase: push
     worker-type: aws-provisioner-v1/gecko-{level}-b-linux
     worker:
         max-run-time: 1200
diff --git a/taskcluster/taskgraph/target_tasks.py b/taskcluster/taskgraph/target_tasks.py
index 33589410fe9d694a7a4c9c835f14e797e759a926..71e8dc54b8c5b4bea13c43ad26262b76c2956ba3 100644
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -593,11 +593,11 @@ def target_tasks_file_update(full_task_graph, parameters, graph_config):
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]
 
 
-@_target_task('bouncer_check')
+@_target_task('cron_bouncer_check')
 def target_tasks_bouncer_check(full_task_graph, parameters, graph_config):
     """Select the set of tasks required to perform bouncer version verification.
     """
     def filter(task):
         # For now any task in the repo-update kind is ok
-        return task.kind in ['bouncer-check']
+        return task.kind in ['cron-bouncer-check']
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t)]