diff --git a/Control/AthenaCommon/python/AtlasThreadedJob.py b/Control/AthenaCommon/python/AtlasThreadedJob.py
index 0c0c1cb1358e7029429c7ba68bfa3565347b50b8..229cad92b2895fe0c84ddfb3b67534184d6204bc 100644
--- a/Control/AthenaCommon/python/AtlasThreadedJob.py
+++ b/Control/AthenaCommon/python/AtlasThreadedJob.py
@@ -61,6 +61,8 @@ def _setupAtlasThreadedJob():
     svcMgr.ForwardSchedulerSvc.MaxEventsInFlight = numStores
     svcMgr.ForwardSchedulerSvc.MaxAlgosInFlight = numAlgsInFlight
     svcMgr.ForwardSchedulerSvc.ThreadPoolSize = numThreads
+    svcMgr.ForwardSchedulerSvc.useGraphFlowManagement = True
+    svcMgr.ForwardSchedulerSvc.DataFlowManagerNext = True
 
     # enable timeline recording
     from GaudiHive.GaudiHiveConf import TimelineSvc