diff --git a/applications/magic_plan/handler.py b/applications/magic_plan/handler.py
index 13bb59c4..cf861908 100644
--- a/applications/magic_plan/handler.py
+++ b/applications/magic_plan/handler.py
@@ -1,21 +1,21 @@
 import os
+import boto3
 from typing import Any, Optional
 
-import boto3
-
+from applications.magic_plan.magic_plan_trigger_request import MagicPlanTriggerRequest
 from infrastructure.magic_plan.config import MagicPlanConfig
 from infrastructure.magic_plan.magic_plan_client import MagicPlanClient
 from infrastructure.s3.s3_client import S3Client
 from orchestration.magic_plan_orchestrator import MagicPlanOrchestrator
-from applications.magic_plan.magic_plan_trigger_request import MagicPlanTriggerRequest
 from domain.magicplan.models import Plan
-from utilities.aws_lambda.subtask_handler import subtask_handler
+from domain.tasks.tasks import Source
+from utilities.aws_lambda.task_handler import task_handler
 from utilities.logger import setup_logger
 
 logger = setup_logger()
 
 
-@subtask_handler()
+@task_handler(task_source="magic_plan", source=Source.HUBSPOT_DEAL)
 def handler(body: dict[str, Any], context: Any) -> Optional[str]:
     config = MagicPlanConfig.from_env(os.environ)
     payload = MagicPlanTriggerRequest.model_validate(body)