diff --git a/.cron.yml b/.cron.yml
index 2f6557aa9..13be1ae0e 100644
--- a/.cron.yml
+++ b/.cron.yml
@@ -26,18 +26,6 @@ jobs:
           treeherder-symbol: fennec-beta
           target-tasks-method: fennec-beta
       when: []  # Force hook only
-    - name: raptor
-      job:
-          type: decision-task
-          treeherder-symbol: raptor-D
-          target-tasks-method: raptor
-      when: [{hour: 1, minute: 0}]
-    - name: browsertime
-      job:
-          type: decision-task
-          treeherder-symbol: btime-D
-          target-tasks-method: browsertime
-      when: [{hour: 1, minute: 0}]
     - name: bump-android-components
       job:
           type: decision-task
diff --git a/taskcluster/ci/browsertime/kind.yml b/taskcluster/ci/browsertime/kind.yml
index 011764a63..361b00d45 100644
--- a/taskcluster/ci/browsertime/kind.yml
+++ b/taskcluster/ci/browsertime/kind.yml
@@ -13,7 +13,7 @@ kind-dependencies:
 primary-dependency: signing
 
 only-for-build-types:
-    - performance-test
+    - nightly
 
 only-for-abis:
     - armeabi-v7a
@@ -81,7 +81,7 @@ job-defaults:
             - '--app=fenix'
             - '--browsertime'
             - '--cold'
-            - '--binary=org.mozilla.fenix.performancetest'
+            - '--binary=org.mozilla.fenix.nightly'
             - '--activity=org.mozilla.fenix.IntentReceiverActivity'
             - '--download-symbols=ondemand'
             - '--browsertime-node=$MOZ_FETCHES_DIR/node/bin/node'
diff --git a/taskcluster/ci/raptor/kind.yml b/taskcluster/ci/raptor/kind.yml
index 607a08c3f..000658188 100644
--- a/taskcluster/ci/raptor/kind.yml
+++ b/taskcluster/ci/raptor/kind.yml
@@ -11,7 +11,7 @@ kind-dependencies:
     - toolchain
 
 only-for-build-types:
-    - performance-test
+    - nightly
 
 only-for-abis:
     - armeabi-v7a
@@ -76,7 +76,7 @@ job-defaults:
             - './test-linux.sh'
             - '--cfg=mozharness/configs/raptor/android_hw_config.py'
             - '--app=fenix'
-            - '--binary=org.mozilla.fenix.performancetest'
+            - '--binary=org.mozilla.fenix.nightly'
             - '--activity=org.mozilla.fenix.IntentReceiverActivity'
             - '--download-symbols=ondemand'
     fetches:
diff --git a/taskcluster/fenix_taskgraph/target_tasks.py b/taskcluster/fenix_taskgraph/target_tasks.py
index 17ac3d393..0ca30502f 100644
--- a/taskcluster/fenix_taskgraph/target_tasks.py
+++ b/taskcluster/fenix_taskgraph/target_tasks.py
@@ -33,7 +33,8 @@ def target_tasks_nightly(full_task_graph, parameters, graph_config):
     def filter(task, parameters):
         # We don't want to ship nightly while Google Play is still behind manual review.
         # See bug 1628413 for more context.
-        return task.attributes.get("nightly", False) and task.kind != "push-apk"
+        return task.attributes.get("nightly", False) and task.kind != "push-apk" or \
+            task.kind in ('browsertime', 'visual-metrics', 'raptor')
 
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t, parameters)]
 
@@ -59,22 +60,6 @@ def target_tasks_fennec_nightly(full_task_graph, parameters, graph_config):
     return [l for l, t in full_task_graph.tasks.iteritems() if _filter_fennec("beta", t, parameters)]
 
 
-@_target_task('raptor')
-def target_tasks_raptor(full_task_graph, parameters, graph_config):
-    def filter(task, parameters):
-        return task.kind == 'raptor'
-
-    return [l for l, t in full_task_graph.tasks.iteritems() if filter(t, parameters)]
-
-
-@_target_task('browsertime')
-def target_tasks_raptor(full_task_graph, parameters, graph_config):
-    def filter(task, parameters):
-        return task.kind in ('browsertime', 'visual-metrics')
-
-    return [l for l, t in full_task_graph.tasks.iteritems() if filter(t, parameters)]
-
-
 @_target_task("bump_android_components")
 def target_tasks_bump_android_components(full_task_graph, parameters, graph_config):
     """Select the set of tasks required to update android components."""