diff --git a/taskcluster/ci/browsertime/kind.yml b/taskcluster/ci/browsertime/kind.yml
index 361b00d45..29a04af0b 100644
--- a/taskcluster/ci/browsertime/kind.yml
+++ b/taskcluster/ci/browsertime/kind.yml
@@ -22,6 +22,7 @@ only-for-abis:
 job-defaults:
     attributes:
         artifact_prefix: public/test_info
+        nightly: true
     dependencies:
         geckoview-nightly: geckoview-nightly
     notify:
diff --git a/taskcluster/ci/raptor/kind.yml b/taskcluster/ci/raptor/kind.yml
index 000658188..07315a15f 100644
--- a/taskcluster/ci/raptor/kind.yml
+++ b/taskcluster/ci/raptor/kind.yml
@@ -19,6 +19,7 @@ only-for-abis:
 
 job-defaults:
     attributes:
+        nightly: true
         retrigger: true
     dependencies:
         geckoview-nightly: geckoview-nightly
diff --git a/taskcluster/ci/visual-metrics/kind.yml b/taskcluster/ci/visual-metrics/kind.yml
index 73d11ffdb..946b9b6fd 100644
--- a/taskcluster/ci/visual-metrics/kind.yml
+++ b/taskcluster/ci/visual-metrics/kind.yml
@@ -22,6 +22,8 @@ transforms:
     - taskgraph.transforms.task:transforms
 
 job-template:
+    attributes:
+        nightly: true
     description: "Run visual metrics calculations on Raptor"
     run-on-projects: []
     run-on-tasks-for: []
diff --git a/taskcluster/fenix_taskgraph/target_tasks.py b/taskcluster/fenix_taskgraph/target_tasks.py
index 0ca30502f..f33c3fc19 100644
--- a/taskcluster/fenix_taskgraph/target_tasks.py
+++ b/taskcluster/fenix_taskgraph/target_tasks.py
@@ -33,8 +33,7 @@ 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" or \
-            task.kind in ('browsertime', 'visual-metrics', 'raptor')
+        return task.attributes.get("nightly", False) and task.kind != "push-apk"
 
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t, parameters)]
 
@@ -44,7 +43,13 @@ def target_tasks_nightly_on_google_play(full_task_graph, parameters, graph_confi
     """Select the set of tasks required for a nightly build that goes on Google Play."""
 
     def filter(task, parameters):
-        return task.attributes.get("nightly", False)
+        return (
+            task.attributes.get("nightly", False) and
+            # This target_task is temporary while Google Play processes APKs slower than usually
+            # (bug 1628413). So we want this target task to be only about shipping APKs to GP and
+            # not doing any other miscellaneous tasks like performance testing
+            task.kind not in ("browsertime", "visual-metrics", "raptor")
+        )
 
     return [l for l, t in full_task_graph.tasks.iteritems() if filter(t, parameters)]