diff --git a/orchestrator/activities/temporal_manager.py b/orchestrator/activities/temporal_manager.py
index 5bfa1f3..8845a48 100644
--- a/orchestrator/activities/temporal_manager.py
+++ b/orchestrator/activities/temporal_manager.py
@@ -25,6 +25,8 @@ with workflow.unsafe.imports_passed_through():
     from orchestrator.utils.converters import parse_frequency
 
 
+RUNTIME_WORKFLOWS = ['predictions_batch']
+
 class TemporalManager(SientiaMonitoring):
     """
     Temporal workflow and schedule management activity.
@@ -213,6 +215,8 @@ class TemporalManager(SientiaMonitoring):
                     self.debug(
                         f'{json.dumps(schedule, indent=4, sort_keys=True)}', metadata=metadata
                     )
+                    
+                    runtime_name = schedule.get('runtime', 'legacy') if workflow_type in RUNTIME_WORKFLOWS else None
 
                     await client.create_schedule(
                         schedule_name,
@@ -222,7 +226,7 @@ class TemporalManager(SientiaMonitoring):
                                 schedule,
                                 id=schedule_name,
                                 task_queue=build_queue_name(
-                                    workflow_type, schedule.get('runtime', 'legacy')
+                                    workflow_type, runtime_name
                                 ),
                                 execution_timeout=timedelta(seconds=execution_timeout_seconds),
                                 run_timeout=timedelta(seconds=execution_timeout_seconds),