diff --git a/Control/AthenaMonitoring/python/TriggerInterface.py b/Control/AthenaMonitoring/python/TriggerInterface.py
index c9e69d09dc97163991401a2743975c3991e4ebc5..95475c1c7cd67853c0fa274a209221b8dc218dd6 100644
--- a/Control/AthenaMonitoring/python/TriggerInterface.py
+++ b/Control/AthenaMonitoring/python/TriggerInterface.py
@@ -16,6 +16,24 @@ def getTrigConfigSvc(inputFlags):
     from EventInfoMgt.TagInfoMgrConfig import TagInfoMgrCfg
 
     rv = ComponentAccumulator()
+    # is MC ? then set up XML reading and get out of here
+    if inputFlags.Input.isMC:
+        from TrigConfigSvc.TrigConfigSvcConfig import (HLTConfigSvc, LVL1ConfigSvc, L1TopoConfigSvc, 
+                                                       findFileInXMLPATH, TrigConfigSvc)
+        hltcs = HLTConfigSvc("HLTConfigSvc")
+        hltcs.XMLMenuFile = findFileInXMLPATH(inputFlags.Trigger.HLTConfigFile)
+        print 'hltcs', hltcs.XMLMenuFile
+        rv.addService(hltcs)
+        lvl1cs = LVL1ConfigSvc("LVL1ConfigSvc")
+        lvl1cs.XMLMenuFile = findFileInXMLPATH(inputFlags.Trigger.LVL1ConfigFile)
+        rv.addService(lvl1cs)
+        l1topocs = L1TopoConfigSvc()
+        l1topocs.XMLMenuFile = findFileInXMLPATH(inputFlags.Trigger.LVL1TopoConfigFile)
+        rv.addService(l1topocs)
+        ts = TrigConfigSvc("TrigConfigSvc")
+        ts.PriorityList = ['xml']
+        rv.addService(ts)
+        return rv
     rv.addService(DSConfigSvc('DSConfigSvc'))
     tcs = SetupTrigConfigSvc()
     tcs.SetStates(["ds"])
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index a31fc917f0556f4dfcaef0b9a135be18d13fdd01..ee24f1758e873978dfa820499a891f7eb7a87aa7 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -80,13 +80,20 @@ def createTriggerFlags():
     flags.addFlag('Trigger.triggerConfig', 'MCRECO:DEFAULT')
 
     # name of the trigger menu
-    flags.addFlag('Trigger.triggerMenuSetup', 'MC_pp_v7_tight_mc_prescale')
+    flags.addFlag('Trigger.triggerMenuSetup', 'Physics_pp_v7_primaries')
 
     # version of the menu
     from AthenaCommon.AppMgr import release_metadata
     flags.addFlag('Trigger.menuVersion',
                   lambda prevFlags:  release_metadata()['release'] )
     
+    # generate or not the HLT configuration
+    flags.addFlag('Trigger.generateHLTConfig', False)
+    
+    # HLT XML file name 
+    flags.addFlag('Trigger.HLTConfigFile',
+                lambda prevFlags: 'HLTconfig_'+prevFlags.Trigger.triggerMenuSetup+'_' + prevFlags.Trigger.menuVersion + '.xml')
+
     # generate or not the L1 configuration
     flags.addFlag('Trigger.generateLVL1Config', False)
     
@@ -98,8 +105,13 @@ def createTriggerFlags():
     flags.addFlag('Trigger.generateLVL1TopoConfig', False)
     
     # L1 topo XML file name
-    flags.addFlag('Trigger.LVL1TopoConfigFile',
-                lambda prevFlags: 'LVL1config_'+prevFlags.Trigger.triggerMenuSetup+'_' + prevFlags.Trigger.menuVersion + '.xml')
+    def _deriveTopoConfigName(prevFlags):
+        import re
+        menuSetup = prevFlags.Trigger.triggerMenuSetup
+        m = re.match('(.*v\d).*', menuSetup)
+        if m: menuSetup = m.groups()[0]
+        return "L1Topoconfig_" + menuSetup + "_" + prevFlags.Trigger.menuVersion + ".xml"
+    flags.addFlag('Trigger.LVL1TopoConfigFile', _deriveTopoConfigName)
 
     
     # trigger reconstruction