diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py
index 4de42d32e9933a106681fd302828ef20d0fc1a64..1478d88c7ed065a98d38550ab24ccb26fd3123bc 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py
@@ -70,7 +70,7 @@ class InDetGMFlags(CommonGMFlags, object):
         self.__dict__["SLHC"] = False
         if _layout in ['IBL'] : self.__dict__["IBL"] = True
         if self.__dict__["IBL"] == False: self.__dict__["IBLlayout"]="noIBL"
-        if _layout not in ['SLHC'] and CommonGeometryFlags.Run().lower()=="run2": self.__dict__["IBL"] = True
+        if _layout not in ['SLHC'] and ( CommonGeometryFlags.Run() in ["RUN2", "RUN3"] ) : self.__dict__["IBL"] = True
         if _layout in ['SLHC'] : self.__dict__["SLHC"] = True
 
 
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py
index 0d3daca6ee0cc44fc9fb920e5fd2c45af9dc29ff..5948b4c49d7ab15025a9ed1ae8030e0828a4a432 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetMonitoringPixel.py
@@ -7,7 +7,7 @@ from InDetRecExample.InDetKeys import InDetKeys
 
 if doAllHits:
   doDCS = False
-  if  (globalflags.DataSource() == 'data' and geoFlags.Run() == "RUN2" and conddb.dbdata == "CONDBR2"):
+  if  (globalflags.DataSource() == 'data' and ( geoFlags.Run() in ["RUN2", "RUN3"] ) and conddb.dbdata == "CONDBR2"):
      doDCS = True 
   InDetPixelMainsMon=PixelMainMon(name                = "InDetPixelMonitoringAllHits",
                                   onTrack             = False,
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
index 879fe45f8e872148e8d61b84ca33cb41c4dd5cd8..7c17fa6f9dff498b48bfae189dd4776de4c04899 100644
--- a/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/InDetRecConditionsAccess.py
@@ -75,8 +75,8 @@ if DetFlags.haveRIO.pixel_on():
                 conddb.addFolder("DCS_OFL","/PIXEL/DCS/FSMSTATE")
             from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as geoFlags
             # from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as idGeoFlags
-            if (rec.doMonitoring() and globalflags.DataSource() == 'data' and geoFlags.Run() == "RUN2" and conddb.dbdata == "CONDBR2"): 
-                # idGeoFlags.isIBL() == True may work too instead of geoFlags.Run() == "RUN2"
+            if (rec.doMonitoring() and globalflags.DataSource() == 'data' and ( geoFlags.Run() in ["RUN2", "RUN3"] ) and conddb.dbdata == "CONDBR2"):
+                # idGeoFlags.isIBL() == True may work too instead of ( geoFlags.Run() in ["RUN2", "RUN3"] )
                 if not conddb.folderRequested('/PIXEL/DCS/PIPES'):
                     conddb.addFolder("DCS_OFL","/PIXEL/DCS/PIPES")
                 if not conddb.folderRequested('/PIXEL/DCS/LV'):
diff --git a/InnerDetector/InDetG4/TRT_G4_SD/python/TRT_G4_SDConfig.py b/InnerDetector/InDetG4/TRT_G4_SD/python/TRT_G4_SDConfig.py
index 84a269d1753177749bd2849f7dfdbe58db70a5ce..d8c4d674ba650585e29eef3982ac1217bae95255 100644
--- a/InnerDetector/InDetG4/TRT_G4_SD/python/TRT_G4_SDConfig.py
+++ b/InnerDetector/InDetG4/TRT_G4_SD/python/TRT_G4_SDConfig.py
@@ -15,7 +15,7 @@ def getTRTSensitiveDetector(name="TRTSensitiveDetector", **kwargs):
                                                               merger_input_property)
     logicalVolumeNames = ["TRT::Gas","TRT::GasMA"]
     from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as geoFlags
-    if geoFlags.Run()=="RUN2":
+    if ( geoFlags.Run() in ["RUN2", "RUN3"] ) :
         ## RUN2 configuration
         logicalVolumeNames += ["TRT::Gas_Ar","TRT::GasMA_Ar",
                                "TRT::Gas_Kr","TRT::GasMA_Kr"]
diff --git a/Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfig.py b/Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfig.py
index d70dcb62a99b6052d2823df2ace100db3ebf4ba6..024611829e8d8f543d8871eb06421046d1a9c45c 100644
--- a/Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfig.py
+++ b/Simulation/G4Atlas/G4AtlasServices/python/G4AtlasServicesConfig.py
@@ -8,8 +8,8 @@ def getATLAS_RegionCreatorList():
     regionCreatorList = []
     from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
     from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
-    isUpgrade = commonGeoFlags.Run()=="RUN3" or commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
-    isRUN2 = commonGeoFlags.Run()=="RUN2" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
+    isUpgrade = commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
+    isRUN2 = (commonGeoFlags.Run() in ["RUN2", "RUN3"]) or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
 
     from G4AtlasApps.SimFlags import simFlags
     from AthenaCommon.DetFlags import DetFlags
diff --git a/Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfig.py b/Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfig.py
index 53558be6c7b7de30c0bdde02c8ad2ecc7e1e0893..e6b35f09ab4ed13c51a3245ea4a1e708998a995c 100644
--- a/Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfig.py
+++ b/Simulation/G4Atlas/G4AtlasTools/python/G4AtlasToolsConfig.py
@@ -69,8 +69,8 @@ def generateInDetSensitiveDetectorList():
 
     from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
     from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
-    isUpgrade = commonGeoFlags.Run()=="RUN3" or commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
-    isRUN2 = commonGeoFlags.Run()=="RUN2" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
+    isUpgrade = commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
+    isRUN2 = (commonGeoFlags.Run() in ["RUN2", "RUN3"]) or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
     isRUN1 = not (isRUN2 or isUpgrade)
 
     from AthenaCommon.DetFlags import DetFlags
diff --git a/Simulation/G4Atlas/G4AtlasTools/python/G4GeometryConfig.py b/Simulation/G4Atlas/G4AtlasTools/python/G4GeometryConfig.py
index 9bba4213296366656466518dfdcf2f2e5da058d0..78be2ca32e8670ba0f77a3621b8064004db7a90e 100644
--- a/Simulation/G4Atlas/G4AtlasTools/python/G4GeometryConfig.py
+++ b/Simulation/G4Atlas/G4AtlasTools/python/G4GeometryConfig.py
@@ -64,8 +64,8 @@ def getCavernInfraGeoDetectorTool(name='CavernInfra', **kwargs):
 def getIDETEnvelope(name="IDET", **kwargs):
     from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
     from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
-    isUpgrade = commonGeoFlags.Run()=="RUN3" or commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
-    isRUN2 = commonGeoFlags.Run()=="RUN2" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
+    isUpgrade = commonGeoFlags.Run()=="RUN4" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isSLHC())
+    isRUN2 = (commonGeoFlags.Run() in ["RUN2", "RUN3"]) or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL())
     isRUN1 = not (isRUN2 or isUpgrade)
 
     kwargs.setdefault("DetectorName", "IDET")
diff --git a/Simulation/G4Atlas/G4AtlasTools/python/G4PhysicsRegionConfig.py b/Simulation/G4Atlas/G4AtlasTools/python/G4PhysicsRegionConfig.py
index 57cdc848ad23cabf849e46d9926cc906d5cfe3c7..16d1a65166515c96aa5a9c281adfe989f978d1a3 100644
--- a/Simulation/G4Atlas/G4AtlasTools/python/G4PhysicsRegionConfig.py
+++ b/Simulation/G4Atlas/G4AtlasTools/python/G4PhysicsRegionConfig.py
@@ -52,7 +52,7 @@ def getPixelPhysicsRegionTool(name='PixelPhysicsRegionTool', **kwargs):
     volumeList = ['Pixel::siLog', 'Pixel::siBLayLog']
     from AtlasGeoModel.CommonGMJobProperties import CommonGeometryFlags as commonGeoFlags
     from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags
-    if commonGeoFlags.Run()=="RUN2" or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL()):
+    if (commonGeoFlags.Run() in ["RUN2", "RUN3"]) or (commonGeoFlags.Run()=="UNDEFINED" and geoFlags.isIBL()):
         volumeList += ['Pixel::dbmDiamondLog']
     kwargs.setdefault("VolumeList",  volumeList)
     kwargs.setdefault("ElectronCut", 0.05)