diff --git a/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigNew.py b/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigNew.py
index af1312ed447c67419fe24b6631711829a3f84cff..667525e8424760d6534bee642c4a134ebf46425e 100644
--- a/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigNew.py
+++ b/AtlasGeometryCommon/SubDetectorEnvelopes/python/SubDetectorEnvelopesConfigNew.py
@@ -147,7 +147,7 @@ def EnvelopeDefSvcCfg(ConfigFlags, name="AtlasGeometry_EnvelopeDefSvc", **kwargs
     kwargs.setdefault("GeoModelSvc", acc.getService("GeoModelSvc"))
     result.merge(acc)
 
-    result.addService(DetDescrDBEnvelopeSvc(name, **kwargs))
+    result.addService(DetDescrDBEnvelopeSvc(name, **kwargs),primary=True)
     return result
 
 
@@ -168,4 +168,4 @@ class Volume:
     return self.r
 
   def getZs(self):
-    return self.z
\ No newline at end of file
+    return self.z
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/ForDetGeoModelConfig.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/ForDetGeoModelConfig.py
index 9eb702a102329986500bb462d2def0e6ba4f704e..58f9da06c3bf45a3345d3f438e14ef54c4afbf84 100644
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/ForDetGeoModelConfig.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/ForDetGeoModelConfig.py
@@ -14,8 +14,8 @@ def ForDetGeometryCfg( ConfigFlags ):
         geoModelSvc.DetectorTools += [ LUCID_DetectorTool() ]
     # ALFA
     if ConfigFlags.Detector.GeometryALFA:
-        from ALFA_GeoModel.ALFA_GeoModelConf import ALFA_DetectorTool 
-
+        #from ALFA_GeoModel.ALFA_GeoModelConf import ALFA_DetectorTool 
+        ALFA_DetectorTool=CompFactory.ALFA_DetectorTool
         theALFA_DetectorTool=ALFA_DetectorTool(name="ALFA_DetectorTool")
         theALFA_DetectorTool.MetrologyType=3
         theALFA_DetectorTool.B7L1U_MDGeometryType = 2
diff --git a/DetectorDescription/RegionSelector/python/RegSelConfig.py b/DetectorDescription/RegionSelector/python/RegSelConfig.py
index 09f6ab56555d0b0bfbb6bee58b48ea7e0e56d0ca..e7ed24b8d6d9bd91be00267b8c5b39a3a94901be 100644
--- a/DetectorDescription/RegionSelector/python/RegSelConfig.py
+++ b/DetectorDescription/RegionSelector/python/RegSelConfig.py
@@ -2,10 +2,12 @@
 #  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
+from AthenaConfiguration.ComponentFactory import CompFactory
+
 def regSelCfg( flags ):
     """ Configures Region Selector Svc according to the detector flags """
     from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-    from RegionSelector.RegionSelectorConf import RegSelSvc
+    RegSelSvc=CompFactory.RegSelSvc
     from AthenaCommon.SystemOfUnits import mm
     acc = ComponentAccumulator()
 
@@ -18,7 +20,7 @@ def regSelCfg( flags ):
         from LArGeoAlgsNV.LArGMConfig import LArGMCfg
         acc.merge( LArGMCfg(  flags ) )
 
-        from LArRegionSelector.LArRegionSelectorConf import LArRegionSelectorTable
+        LArRegionSelectorTable=CompFactory.LArRegionSelectorTable
         regSel.LArRegionSelectorTable = LArRegionSelectorTable(name="LArRegionSelectorTable")
 
         from IOVDbSvc.IOVDbSvcConfig import addFolders
@@ -31,13 +33,13 @@ def regSelCfg( flags ):
         acc.merge( TileGMCfg( flags ) )
         acc.getService('GeoModelSvc').DetectorTools['TileDetectorTool'].GeometryConfig = 'RECO'
 
-        from TileRawUtils.TileRawUtilsConf import TileRegionSelectorTable
+        TileRegionSelectorTable=CompFactory.TileRegionSelectorTable
         regSel.TileRegionSelectorTable = TileRegionSelectorTable(name="TileRegionSelectorTable")
 
     if flags.Detector.GeometryPixel:
         regSel.enableID = True
         regSel.enablePixel = True        
-        from InDetRegionSelector.InDetRegionSelectorConf import SiRegionSelectorTable
+        SiRegionSelectorTable=CompFactory.SiRegionSelectorTable
         regSel.PixelRegionLUT_CreatorTool = SiRegionSelectorTable(name        = "PixelRegionSelectorTable",
                                                                   ManagerName = "Pixel",
                                                                   OutputFile  = "RoITablePixel.txt",
@@ -47,7 +49,7 @@ def regSelCfg( flags ):
     if flags.Detector.GeometrySCT:
         regSel.enableID = True
         regSel.enableSCT = True
-        from InDetRegionSelector.InDetRegionSelectorConf import SiRegionSelectorTable
+        SiRegionSelectorTable=CompFactory.SiRegionSelectorTable
         regSel.SCT_RegionLUT_CreatorTool = SiRegionSelectorTable(name        = "SCT_RegionSelectorTable",
                                                                  ManagerName = "SCT",
                                                                  OutputFile  = "RoITableSCT.txt",
@@ -57,7 +59,7 @@ def regSelCfg( flags ):
     if flags.Detector.GeometryTRT:
         regSel.enableID = True
         regSel.enableTRT = True
-        from InDetRegionSelector.InDetRegionSelectorConf import TRT_RegionSelectorTable
+        TRT_RegionSelectorTable=CompFactory.TRT_RegionSelectorTable
         regSel.TRT_RegionLUT_CreatorTool = TRT_RegionSelectorTable(name = "TRT_RegionSelectorTable",
                                                                    ManagerName = "TRT",
                                                                    OutputFile  = "RoITableTRT.txt",
@@ -69,28 +71,28 @@ def regSelCfg( flags ):
         regSel.enableRPC  = False
     else:
         regSel.enableMuon = True
-        from MuonRegionSelector.MuonRegionSelectorConf import RPC_RegionSelectorTable
+        RPC_RegionSelectorTable=CompFactory.RPC_RegionSelectorTable
         regSel.RPCRegionSelectorTable = RPC_RegionSelectorTable(name = "RPC_RegionSelectorTable")
 
     if not flags.Detector.GeometryMDT:
         regSel.enableMDT  = False
     else:
         regSel.enableMuon = True
-        from MuonRegionSelector.MuonRegionSelectorConf import MDT_RegionSelectorTable
+        MDT_RegionSelectorTable=CompFactory.MDT_RegionSelectorTable
         regSel.MDTRegionSelectorTable = MDT_RegionSelectorTable(name = "MDT_RegionSelectorTable")
 
     if not flags.Detector.GeometryTGC:
         regSel.enableTGC  = False
     else:
         regSel.enableMuon = True
-        from MuonRegionSelector.MuonRegionSelectorConf import TGC_RegionSelectorTable
+        TGC_RegionSelectorTable=CompFactory.TGC_RegionSelectorTable
         regSel.TGCRegionSelectorTable = TGC_RegionSelectorTable(name = "TGC_RegionSelectorTable")
 
     if not flags.Detector.GeometryCSC:
         regSel.enableCSC  = False
     else:
         regSel.enableMuon = True
-        from MuonRegionSelector.MuonRegionSelectorConf import CSC_RegionSelectorTable
+        CSC_RegionSelectorTable=CompFactory.CSC_RegionSelectorTable
         regSel.CSCRegionSelectorTable = CSC_RegionSelectorTable(name = "CSC_RegionSelectorTable")
 
     if not flags.Detector.GeometryMM:
@@ -105,8 +107,6 @@ def regSelCfg( flags ):
 
 if __name__ == "__main__":
 
-    from AthenaCommon.Configurable import Configurable
-    Configurable.configurableRun3Behavior=True
 
     from AthenaConfiguration.AllConfigFlags import ConfigFlags
     from AthenaConfiguration.TestDefaults import defaultTestFiles
@@ -144,15 +144,15 @@ if __name__ == "__main__":
     cfg.merge( acc )
 
 
-    from RegSelSvcTest.RegSelSvcTestConf import RegSelTestAlg
+    RegSelTestAlg=CompFactory.RegSelTestAlg
     testerAlg = RegSelTestAlg()
     testerAlg.Mt=True    
     testerAlg.OutputLevel=DEBUG
     cfg.addEventAlgo( testerAlg )
-    from AthenaPoolCnvSvc.AthenaPoolCnvSvcConf import AthenaPoolCnvSvc
+    AthenaPoolCnvSvc=CompFactory.AthenaPoolCnvSvc
     apcs=AthenaPoolCnvSvc()
     cfg.addService(apcs)
-    from GaudiSvc.GaudiSvcConf import EvtPersistencySvc
+    EvtPersistencySvc=CompFactory.EvtPersistencySvc
     cfg.addService(EvtPersistencySvc("EventPersistencySvc",CnvServices=[apcs.getFullJobOptName(),]))
 
     cfg.getService("IOVDbSvc").OutputLevel=DEBUG