diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index 695d4aad5648c9b3ab63b3ce518a0c7734346d56..1a7fca5384a7871acd139e129c844aa5c8dd26c8 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -295,6 +295,7 @@ def createTriggerRecoFlags():
         muonflags.Muon.MuonTrigger=True
         muonflags.Muon.SAMuonTrigger=True
         muonflags.Muon.runCommissioningChain=False
+        muonflags.Muon.enableErrorTuning=False
         return muonflags
 
     def __muon():
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonRecoSequences.py
index b5e2e3d6b9af51e6c7851c20cb02c9fb274fc7fd..fe0f1e03f59b6011c1406efef5855adbc3d401ab 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLT/Muon/MuonRecoSequences.py
@@ -404,11 +404,11 @@ def muEFSARecoSequence( flags, RoIs, name ):
 
   from AthenaCommon import CfgMgr
   from AthenaCommon.CFElements import parOR
-  from MuonRecExample.MuonStandalone import MuonStandaloneTrackParticleCnvAlg, MuonStationsInterSectAlg
-  from MuonCombinedRecExample.MuonCombinedAlgs import MuonCombinedMuonCandidateAlg, MuonCreatorAlg
   from MuonCombinedAlgs.MuonCombinedAlgsMonitoring import MuonCreatorAlgMonitoring
   from MuonConfig.MuonSegmentFindingConfig import MooSegmentFinderAlgCfg, MuonSegmentFinderAlgCfg, MuonLayerHoughAlgCfg, MuonSegmentFilterAlgCfg
   from MuonConfig.MuonTrackBuildingConfig import MuPatTrackBuilderCfg, EMEO_MuPatTrackBuilderCfg
+  from xAODTrackingCnv.xAODTrackingCnvConfig import MuonStandaloneTrackParticleCnvAlgCfg
+  from MuonCombinedConfig.MuonCombinedReconstructionConfig import MuonCombinedMuonCandidateAlgCfg, MuonCreatorAlgCfg
 
   muEFSARecoSequence = parOR("efmsViewNode_"+name)
 
@@ -419,17 +419,6 @@ def muEFSARecoSequence( flags, RoIs, name ):
 
   muEFSARecoSequence+= EFMuonViewDataVerifier
 
-  #need MdtCondDbAlg for the MuonStationIntersectSvc (required by segment and track finding)
-  from AthenaCommon.AlgSequence import AthSequencer
-  from MuonCondAlg.MuonTopCondAlgConfigRUN2 import MdtCondDbAlg
-  if not athenaCommonFlags.isOnline:
-    condSequence = AthSequencer("AthCondSeq")
-    if not hasattr(condSequence,"MdtCondDbAlg"):
-      condSequence += MdtCondDbAlg("MdtCondDbAlg")
-    # Sets up and configures the muon alignment:
-    from MuonRecExample import MuonAlignConfig # noqa: F401
-
-  MuonStationsInterSectAlg()
   if (MuonGeometryFlags.hasSTGC() and MuonGeometryFlags.hasMM()):
       theMuonLayerHough = algorithmCAToGlobalWrapper(MuonLayerHoughAlgCfg, flags, "TrigMuonLayerHoughAlg")
       muEFSARecoSequence+=theMuonLayerHough
@@ -453,14 +442,14 @@ def muEFSARecoSequence( flags, RoIs, name ):
   else:
     TrackBuilder = algorithmCAToGlobalWrapper(MuPatTrackBuilderCfg, flags, name="TrigMuPatTrackBuilder_"+name ,MuonSegmentCollection = "TrackMuonSegments", MonTool = MuPatTrackBuilderMonitoring(flags, "MuPatTrackBuilderMonitoringSA_"+name))
 
-  xAODTrackParticleCnvAlg = MuonStandaloneTrackParticleCnvAlg("TrigMuonStandaloneTrackParticleCnvAlg_"+name)
-  theMuonCandidateAlg=MuonCombinedMuonCandidateAlg("TrigMuonCandidateAlg_"+name)
+  xAODTrackParticleCnvAlg = algorithmCAToGlobalWrapper(MuonStandaloneTrackParticleCnvAlgCfg,flags, name = "TrigMuonStandaloneTrackParticleCnvAlg_"+name)
+  theMuonCandidateAlg=algorithmCAToGlobalWrapper(MuonCombinedMuonCandidateAlgCfg, flags, name="TrigMuonCandidateAlg_"+name)
 
   msMuonName = muNames.EFSAName
   if 'FS' in name:
     msMuonName = muNamesFS.EFSAName
 
-  themuoncreatoralg = MuonCreatorAlg("TrigMuonCreatorAlg_"+name, CreateSAmuons=True, TagMaps=[], MuonContainerLocation=msMuonName,
+  themuoncreatoralg = algorithmCAToGlobalWrapper(MuonCreatorAlgCfg, flags, name="TrigMuonCreatorAlg_"+name, CreateSAmuons=True, TagMaps=[], MuonContainerLocation=msMuonName,
                                      ExtrapolatedLocation = "HLT_MSExtrapolatedMuons_"+name, MSOnlyExtrapolatedLocation = "HLT_MSOnlyExtrapolatedMuons_"+name,
                                      MuonCreatorTool = CfgGetter.getPrivateToolClone("TrigMuonCreatorToolSA", "MuonCreatorTool", TrackSummaryTool = CfgGetter.getPublicTool("MuonTrackSummaryTool")),
                                      MonTool = MuonCreatorAlgMonitoring("MuonCreatorAlgSA_"+name))
@@ -476,7 +465,7 @@ def muEFSARecoSequence( flags, RoIs, name ):
   muEFSARecoSequence+=themuoncreatoralg
 
 
-  sequenceOut = themuoncreatoralg.MuonContainerLocation
+  sequenceOut = msMuonName
 
   return muEFSARecoSequence, sequenceOut