diff --git a/automation/taskcluster/decision_task.py b/automation/taskcluster/decision_task.py
index 63fdba4b406d..46459d03c342 100644
--- a/automation/taskcluster/decision_task.py
+++ b/automation/taskcluster/decision_task.py
@@ -80,13 +80,9 @@ def pr_or_push(is_push):
             signing_tasks[signing_task_id] = BUILDER.craft_master_commit_signing_task(assemble_task_id, variant)
 
             ALL_RAPTOR_CRAFT_FUNCTIONS = [
-                BUILDER.craft_raptor_tp6m_task(for_suite=i)
+                BUILDER.craft_raptor_tp6m_cold_task(for_suite=i)
                 for i in range(1, 11)
-            ] + [
-                BUILDER.craft_raptor_speedometer_task,
-                BUILDER.craft_raptor_speedometer_power_task,
             ]
-
             for craft_function in ALL_RAPTOR_CRAFT_FUNCTIONS:
                 args = (signing_task_id, mozharness_task_id, variant, gecko_revision)
                 other_tasks[taskcluster.slugId()] = craft_function(*args)
diff --git a/automation/taskcluster/lib/tasks.py b/automation/taskcluster/lib/tasks.py
index d80047d72e07..6f6a8bdda2e5 100644
--- a/automation/taskcluster/lib/tasks.py
+++ b/automation/taskcluster/lib/tasks.py
@@ -452,39 +452,7 @@ def craft_push_task(
             },
         )
 
-    def craft_raptor_speedometer_task(self, signing_task_id, mozharness_task_id, variant, gecko_revision, force_run_on_64_bit_device=False):
-        return self._craft_raptor_task(
-            signing_task_id,
-            mozharness_task_id,
-            variant,
-            gecko_revision,
-            name_prefix='raptor speedometer',
-            description='Raptor Speedometer on Fenix',
-            test_name='raptor-speedometer',
-            job_symbol='sp',
-            force_run_on_64_bit_device=force_run_on_64_bit_device,
-        )
-
-    def craft_raptor_speedometer_power_task(self, signing_task_id, mozharness_task_id, variant, gecko_revision, force_run_on_64_bit_device=False):
-        return self._craft_raptor_task(
-            signing_task_id,
-            mozharness_task_id,
-            variant,
-            gecko_revision,
-            name_prefix='raptor speedometer power',
-            description='Raptor Speedometer power on Fenix',
-            test_name='raptor-speedometer',
-            job_symbol='sp',
-            group_symbol='Rap-P',
-            extra_test_args=[
-                "--power-test",
-                "--page-cycles 5",
-                "--host HOST_IP",
-            ],
-            force_run_on_64_bit_device=force_run_on_64_bit_device,
-        )
-
-    def craft_raptor_tp6m_task(self, for_suite):
+    def craft_raptor_tp6m_cold_task(self, for_suite):
 
         def craft_function(signing_task_id, mozharness_task_id, variant, gecko_revision, force_run_on_64_bit_device=False):
             return self._craft_raptor_task(
@@ -492,10 +460,10 @@ def craft_function(signing_task_id, mozharness_task_id, variant, gecko_revision,
                 mozharness_task_id,
                 variant,
                 gecko_revision,
-                name_prefix='raptor tp6m-{}'.format(for_suite),
-                description='Raptor tp6m on the Fenix',
-                test_name='raptor-tp6m-{}'.format(for_suite),
-                job_symbol='tp6m-{}'.format(for_suite),
+                name_prefix='raptor tp6m-cold-{}'.format(for_suite),
+                description='Raptor tp6m cold on Fenix',
+                test_name='raptor-tp6m-cold-{}'.format(for_suite),
+                job_symbol='tp6m-c-{}'.format(for_suite),
                 force_run_on_64_bit_device=force_run_on_64_bit_device,
             )
         return craft_function