diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index a7b8024d71e1ed779248bdb663b54cb853bbe483..dbf7451ac3e1e391d55280cb89e2f9c59bb9dc02 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -49,10 +49,8 @@ def _createCfgFlags():
 
 
 # Trigger
-    acf.addFlag("Trigger.inputLVL1ConfigFile", "UNSPECIFIED")
-    acf.addFlag("Trigger.L1Decoder.doMuon", True) # should have dependency on detector flag doCalo
-    acf.addFlag("Trigger.L1Decoder.doCalo", True) 
-    acf.addFlag("Trigger.L1Decoder.forceEnableAllChains", True)
+    from TriggerJobOpts.NewTriggerFlags import createTriggerFlags
+    acf.join( createTriggerFlags() )
 
 
     return acf