diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py
index 746983694389b..5498bc84011dd 100644
--- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DD4hep_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheck2026DD4hep_cfg.py geometry=D92 tol=0.1
 #
-#   Options for geometry D88, D92, D93, D94, D95, D96, D98, D99
+#   Options for geometry D88, D91, D92, D93, D94, D95, D96, D98, D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D88",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D94, D95, D96, D98, D99")
+                  "geometry of operations: D88, D91, D92, D93, D94, D95, D96, D98, D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -32,9 +32,13 @@
 ####################################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
-process = cms.Process('PROD',Phase2C17I13M9,dd4hep)
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('OverlapCheck',Phase2C20I13M9,dd4hep)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('OverlapCheck',Phase2C17I13M9,dd4hep)
 
 geomFile = "Configuration.Geometry.GeometryDD4hepExtended2026" + options.geometry + "Reco_cff"
 baseName = "cms2026" + options.geometry + "DD4hep"
diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py
index 426b278ee03ae..07c1a7b85b45a 100644
--- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck2026DDD_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheck2026DDD_cfg.py geometry=D88 tol=0.1
 #
-#   Options for geometry D88, D92, D93, D94, D95, D96, D98, D99
+#   Options for geometry D88, D91, D92, D93, D94, D95, D96, D98, D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D88",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D94, D95, D96, D98, D99")
+                  "geometry of operations: D88, D91, D92, D93, D94, D95, D96, D98, D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -32,8 +32,12 @@
 ####################################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process('PROD',Phase2C17I13M9)
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('OverlapCheck',Phase2C20I13M9)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('OverlapCheck',Phase2C17I13M9)
 
 geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
 baseName = "cms2026" + options.geometry + "DDD"
diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py
index 52caea481709b..2ce983ff07a01 100644
--- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckCalo_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheckCalo_cfg.py geometry=2021 tol=0.1
 #
-#   Options for geometry 2016, 2017, 2021, 2026D77, 2026D86, 2026D88
+#   Options for geometry 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "2021",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: 2016, 2017, 2021, 2026D77, 2026D86, 2026D88")
+                  "geometry of operations: 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -33,20 +33,25 @@
 # Use the options
 
 if (options.geometry == "2026D88"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
     process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
     baseName = 'Hcal2026D88'
-elif (options.geometry == "2026D86"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
-    baseName = 'Hcal2026D86'
-elif (options.geometry == "2026D77"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('G4PrintGeometry',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff')
-    baseName = 'Hcal2026D77'
+elif (options.geometry == "2026D92"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+    baseName = 'Hcal2026D92'
+elif (options.geometry == "2026D93"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
+    baseName = 'Hcal2026D93'
+elif (options.geometry == "2026D99"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D99Reco_cff')
+    baseName = 'Hcal2026D99'
 elif (options.geometry == "2016"):
     from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
     process = cms.Process('G4PrintGeometry',Run2_2016)
diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py
index 2ba77510b8ef7..f4d847dbef0a6 100644
--- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckEcal_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheckEcal_cfg.py geometry=2021 tol=0.1
 #
-#   Options for geometry 2016, 2017, 2021, 2026D77, 2026D86, 2026D88
+#   Options for geometry 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "2021",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: 2016, 2017, 2021, 2026D77, 2026D86, 2026D88")
+                  "geometry of operations: 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -33,20 +33,25 @@
 # Use the options
 
 if (options.geometry == "2026D88"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
     process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
     baseName = 'Ecal2026D88'
-elif (options.geometry == "2026D86"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
-    baseName = 'Ecal2026D86'
-elif (options.geometry == "2026D77"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('G4PrintGeometry',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff')
-    baseName = 'Ecal2026D77'
+elif (options.geometry == "2026D92"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+    baseName = 'Ecal2026D92'
+elif (options.geometry == "2026D93"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
+    baseName = 'Ecal2026D93'
+elif (options.geometry == "2026D99"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D99Reco_cff')
+    baseName = 'Ecal2026D99'
 elif (options.geometry == "2016"):
     from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
     process = cms.Process('G4PrintGeometry',Run2_2016)
diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckHGCal_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckHGCal_cfg.py
index 4c4748cd7efc0..b0f3577f11f36 100644
--- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckHGCal_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckHGCal_cfg.py
@@ -1,8 +1,8 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun g4OverlapCheckHGCal_cfg.py geometry=D86 tol=0.1
+#   cmsRun g4OverlapCheckHGCal_cfg.py geometry=D88 tol=0.1
 #
-#   Options for geometry D77, D83, D86, D88
+#   Options for geometry D88, D92, D93, D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -13,10 +13,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D86",
+                 "D92",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D77, D83, D86, D88")
+                  "geometry of operations: D88, D92, D93, D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -32,29 +32,15 @@
 ####################################################################
 # Use the options
 
-if (options.geometry == "D83"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import PHase2c11m9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff')
-    baseName = 'HGCal2026D83'
-elif (options.geometry == "D86"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
-    baseName = 'HGCal2026D86'
-elif (options.geometry == "D77"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('G4PrintGeometry',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff')
-    baseName = 'HGCal2026D77'
-else:
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-    baseName = 'HGCal2026D86'
+from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+baseName = "HGCal2026" + options.geometry
 
-print("Base file Name: ", baseName)
+print("Geometry file Name: ", geomFile)
+print("Base file Name:     ", baseName)
 
+process.load(geomFile)
 from SimG4Core.PrintGeomInfo.g4TestGeometry_cfi import *
 process = checkOverlap(process)
 
diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py
index 0e3fc9269759d..3870b8b12d1b6 100644
--- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckMuon_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheckMuon_cfg.py geometry=2021 tol=0.1
 #
-#   Options for geometry 2016, 2017, 2021, 2026D77, 2026D86, 2026D88
+#   Options for geometry 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "2021",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: 2016, 2017, 2021, 2026D77, 2026D86, 2026D88")
+                  "geometry of operations: 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -33,20 +33,25 @@
 # Use the options
 
 if (options.geometry == "2026D88"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
     process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
     baseName = 'Muon2026D88'
-elif (options.geometry == "2026D86"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
-    baseName = 'Muon2026D86'
-elif (options.geometry == "2026D77"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('G4PrintGeometry',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff')
-    baseName = 'Muon2026D77'
+elif (options.geometry == "2026D92"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+    baseName = 'Muon2026D92'
+elif (options.geometry == "2026D93"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
+    baseName = 'Muon2026D93'
+elif (options.geometry == "2026D99"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D99Reco_cff')
+    baseName = 'Muon2026D99'
 elif (options.geometry == "2016"):
     from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
     process = cms.Process('G4PrintGeometry',Run2_2016)
diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py
index 6092d738cfef4..c181eff445534 100644
--- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckNoseDDD_cfg.py
@@ -1,8 +1,8 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun g4OverlapCheckNoseDDD_cfg.py geometry=D82 tol=0.1
+#   cmsRun g4OverlapCheckNoseDDD_cfg.py geometry=D94 tol=0.1
 #
-#   Options for geometry D60, D82, D94
+#   Options for geometry D94
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D94",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D60, D82, D94")
+                  "geometry of operations: D94")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -32,23 +32,16 @@
 ####################################################################
 # Use the options
 
-if (options.geometry == "D60"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('PROD',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D60Reco_cff')
-    baseName = 'cms2026D60DDD'
-elif (options.geometry == "D82"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('PROD',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D82Reco_cff')
-    baseName = 'cms2026D82DDD'
-else:
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('PROD',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D94Reco_cff')
-    baseName = 'cms2026D94DDD'
+from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+process = cms.Process('OverlapCheck',Phase2C20I13M9)
 
-print("Base file Name: ", baseName)
+
+baseName = "cms2026" + options.geometry + "DDD"
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+
+
+print("Geometry file Name: ", geomFile)
+print("Base file Name:     ", baseName)
 
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py
index c54be774b72dc..c5fc5d3a039f5 100644
--- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckTracker_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun g4OverlapCheckTracker_cfg.py geometry=2021 tol=0.1
 #
-#   Options for geometry 2016, 2017, 2021, 2026D77, 2026D86, 2026D88
+#   Options for geometry 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "2021",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: 2016, 2017, 2021, 2026D77, 2026D86, 2026D88")
+                  "geometry of operations: 2016, 2017, 2021, 2026D88, 2026D92, 2026D93, 2026D99")
 options.register('tol',
                  0.1,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -33,20 +33,25 @@
 # Use the options
 
 if (options.geometry == "2026D88"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
     process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
     baseName = 'Tracker2026D88'
-elif (options.geometry == "2026D86"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
-    baseName = 'Tracker2026D86'
-elif (options.geometry == "2026D77"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('G4PrintGeometry',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff')
-    baseName = 'Tracker2026D77'
+elif (options.geometry == "2026D92"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
+    baseName = 'Tracker2026D92'
+elif (options.geometry == "2026D93"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D93Reco_cff')
+    baseName = 'Tracker2026D93'
+elif (options.geometry == "2026D99"):
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
+    process.load('Configuration.Geometry.GeometryExtended2026D99Reco_cff')
+    baseName = 'Tracker2026D99'
 elif (options.geometry == "2016"):
     from Configuration.Eras.Era_Run2_2016_cff import Run2_2016
     process = cms.Process('G4PrintGeometry',Run2_2016)
diff --git a/SimG4Core/PrintGeomInfo/test/python/runDD4hep2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDD4hep2026_cfg.py
index 671241ce8562a..ed53f5ec6fab1 100644
--- a/SimG4Core/PrintGeomInfo/test/python/runDD4hep2026_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/runDD4hep2026_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun runDD4hep2026_cfg.py geometry=D92
 #
-#   Options for geometry D77, D83, D88, D92, D93
+#   Options for geometry D88, D91, D92, D93, D94, D95, D96, D97, D98, D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D92",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D77, D83, D88, D92, D93")
+                  "geometry of operations: D88, D91, D92, D93, D94, D95, D96, D97, D98, D99")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -27,63 +27,30 @@
 # Use the options
 
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
-if (options.geometry == "D83"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9,dd4hep)
-    process.load('Configuration.Geometry.GeometryDD4hepExtended2026D83Reco_cff')
-    materialFileName = 'matfileD83DD4hep.txt'
-    solidFileName    = 'solidfileD83DD4hep.txt'
-    lvFileName       = 'lvfileD83DD4hep.txt'
-    pvFileName       = 'pvfileD83DD4hep.txt'
-    touchFileName    = 'touchfileD83DD4hep.txt'
-    regionFileName   = 'regionfileD83DD4hep.txt'
-elif (options.geometry == "D77"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('G4PrintGeometry',Phase2C11,dd4hep)
-    process.load('Configuration.Geometry.GeometryDD4hepExtended2026D77Reco_cff')
-    materialFileName = 'matfileD77DD4hep.txt'
-    solidFileName    = 'solidfileD77DD4hep.txt'
-    lvFileName       = 'lvfileD77DD4hep.txt'
-    pvFileName       = 'pvfileD77DD4hep.txt'
-    touchFileName    = 'touchfileD77DD4hep.txt'
-elif (options.geometry == "D92"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9,dd4hep)
-    process.load('Configuration.Geometry.GeometryDD4hepExtended2026D92Reco_cff')
-    materialFileName = 'matfileD92DD4hep.txt'
-    solidFileName    = 'solidfileD92DD4hep.txt'
-    lvFileName       = 'lvfileD92DD4hep.txt'
-    pvFileName       = 'pvfileD92DD4hep.txt'
-    touchFileName    = 'touchfileD92DD4hep.txt'
-    regionFileName   = 'regionfileD92DD4hep.txt'
-elif (options.geometry == "D93"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9,dd4hep)
-    process.load('Configuration.Geometry.GeometryDD4hepExtended2026D86Reco_cff')
-    materialFileName = 'matfileD93DD4hep.txt'
-    solidFileName    = 'solidfileD93DD4hep.txt'
-    lvFileName       = 'lvfileD93DD4hep.txt'
-    pvFileName       = 'pvfileD93DD4hep.txt'
-    touchFileName    = 'touchfileD93DD4hep.txt'
-    regionFileName   = 'regionfileD93DD4hep.txt'
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C20I13M9,dd4hep)
 else:
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9,dd4hep)
-    process.load('Configuration.Geometry.GeometryDD4hepExtended2026D88Reco_cff')
-    materialFileName = 'matfileD88DD4hep.txt'
-    solidFileName    = 'solidfileD88DD4hep.txt'
-    lvFileName       = 'lvfileD88DD4hep.txt'
-    pvFileName       = 'pvfileD88DD4hep.txt'
-    touchFileName    = 'touchfileD88DD4hep.txt'
-    regionFileName   = 'regionfileD88DD4hep.txt'
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9,dd4hep)
 
+geomFile = "Configuration.Geometry.GeometryDD4hepExtended2026" + options.geometry + "Reco_cff"
+materialFileName = "matfile" + options.geometry + "DD4hep.txt"
+solidFileName    = "solidfile" + options.geometry + "DD4hep.txt"
+lvFileName       = "lvfile" + options.geometry + "DD4hep.txt"
+pvFileName       = "pvfile" + options.geometry + "DD4hep.txt"
+touchFileName    = "touchfile" + options.geometry + "DD4hep.txt"
+regionFileName   = "regionfile" + options.geometry + "DD4hep.txt"
+
+print("Geometry file Name: ", geomFile)
 print("Material file Name: ", materialFileName)
-print("Solid file Name: ", solidFileName)
-print("LV file Name: ", lvFileName)
-print("PV file Name: ", pvFileName)
-print("Touch file Name: ", touchFileName)
-print("Region file Name: ", regionFileName)
+print("Solid file Name:    ", solidFileName)
+print("LV file Name:       ", lvFileName)
+print("PV file Name:       ", pvFileName)
+print("Touch file Name:    ", touchFileName)
+print("Region file Name:   ", regionFileName)
 
+process.load(geomFile)
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 from SimG4Core.PrintGeomInfo.g4PrintGeomInfo_cfi import *
diff --git a/SimG4Core/PrintGeomInfo/test/python/runDDD2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDDD2026_cfg.py
index eab0885e382d5..4c3efb2a17d8f 100644
--- a/SimG4Core/PrintGeomInfo/test/python/runDDD2026_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/runDDD2026_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun runDDD2026_cfg.py geometry=D88
 #
-#   Options for geometry D77, D83, D88, D92, D93
+#   Options for geometry D88, D91, D92, D93, D94, D95, D96, D97, D98, D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D92",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D77, D83, D88, D92, D93")
+                  "geometry of operations: D88, D91, D92, D93, D94, D95, D96, D97, D98, D99")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -26,64 +26,30 @@
 ####################################################################
 # Use the options
 
-if (options.geometry == "D83"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D83Reco_cff')
-    materialFileName = 'matfileD83DDD.txt'
-    solidFileName    = 'solidfileD83DDD.txt'
-    lvFileName       = 'lvfileD83DDD.txt'
-    pvFileName       = 'pvfileD83DDD.txt'
-    touchFileName    = 'touchfileD83DDD.txt'
-    regionFileName   = 'regionfileD83DDD.txt'
-elif (options.geometry == "D77"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('G4PrintGeometry',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D77Reco_cff')
-    materialFileName = 'matfileD77DDD.txt'
-    solidFileName    = 'solidfileD77DDD.txt'
-    lvFileName       = 'lvfileD77DDD.txt'
-    pvFileName       = 'pvfileD77DDD.txt'
-    touchFileName    = 'touchfileD77DDD.txt'
-    regionFileName   = 'regionfileD77DDD.txt'
-elif (options.geometry == "D92"):
-    from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
-    process = cms.Process('G4PrintGeometry',Phase2C11)
-    process.load('Configuration.Geometry.GeometryExtended2026D92Reco_cff')
-    materialFileName = 'matfileD92DDD.txt'
-    solidFileName    = 'solidfileD92DDD.txt'
-    lvFileName       = 'lvfileD92DDD.txt'
-    pvFileName       = 'pvfileD92DDD.txt'
-    touchFileName    = 'touchfileD92DDD.txt'
-    regionFileName   = 'regionfileD92DDD.txt'
-elif (options.geometry == "D93"):
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D86Reco_cff')
-    materialFileName = 'matfileD93DDD.txt'
-    solidFileName    = 'solidfileD93DDD.txt'
-    lvFileName       = 'lvfileD93DDD.txt'
-    pvFileName       = 'pvfileD93DDD.txt'
-    touchFileName    = 'touchfileD93DDD.txt'
-    regionFileName   = 'regionfileD93DDD.txt'
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C20I13M9)
 else:
-    from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
-    process = cms.Process('G4PrintGeometry',Phase2C11M9)
-    process.load('Configuration.Geometry.GeometryExtended2026D88Reco_cff')
-    materialFileName = 'matfileD88DDD.txt'
-    solidFileName    = 'solidfileD88DDD.txt'
-    lvFileName       = 'lvfileD88DDD.txt'
-    pvFileName       = 'pvfileD88DDD.txt'
-    touchFileName    = 'touchfileD88DDD.txt'
-    regionFileName   = 'regionfileD88DDD.txt'
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
 
+geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+materialFileName = "matfile" + options.geometry + "DDD.txt"
+solidFileName    = "solidfile" + options.geometry + "DDD.txt"
+lvFileName       = "lvfile" + options.geometry + "DDD.txt"
+pvFileName       = "pvfile" + options.geometry + "DDD.txt"
+touchFileName    = "touchfile" + options.geometry + "DDD.txt"
+regionFileName   = "regionfile" + options.geometry + "DDD.txt"
+
+print("Geometry file Name: ", geomFile)
 print("Material file Name: ", materialFileName)
-print("Solid file Name: ", solidFileName)
-print("LV file Name: ", lvFileName)
-print("PV file Name: ", pvFileName)
-print("Touch file Name: ", touchFileName)
-print("Region file Name: ", regionFileName)
+print("Solid file Name:    ", solidFileName)
+print("LV file Name:       ", lvFileName)
+print("PV file Name:       ", pvFileName)
+print("Touch file Name:    ", touchFileName)
+print("Region file Name:   ", regionFileName)
 
+process.load(geomFile)
 process.load('FWCore.MessageService.MessageLogger_cfi')
 
 from SimG4Core.PrintGeomInfo.g4PrintGeomInfo_cfi import *
diff --git a/SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids_cfg.py
index a874abdabb393..30623f5bb031b 100644
--- a/SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/runPrintG4Solids_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun grunPrintG4Solids_cfg.py geometry=D88 dd4hep=False
 #
-#   Options for geometry D88, D92, D93, D94, D95, D96, D98, D99
+#   Options for geometry D88, D91, D92, D93, D94, D95, D96, D98, D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D88",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D94, D95, D96, D98, D99")
+                  "geometry of operations: D88, D91, D92, D93, D94, D95, D96, D98, D99")
 options.register('dd4hep',
                  False,
                  VarParsing.VarParsing.multiplicity.singleton,
@@ -31,14 +31,24 @@
 ####################################################################
 # Use the options
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
 
 if (options.dd4hep):
-    process = cms.Process('PrintG4Solids',Phase2C17I13M9,dd4hep)
     geomFile = "Configuration.Geometry.GeometryDD4hepExtended2026" + options.geometry + "Reco_cff"
+    if (options.geometry == "D94"):
+        from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+        process = cms.Process('PrintG4Solids',Phase2C20I13M9,dd4hep)
+    else:
+        from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+        process = cms.Process('PrintG4Solids',Phase2C17I13M9,dd4hep)
 else:
     process = cms.Process('PrintG4Solids',Phase2C17I13M9)
-    geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
+ + "Reco_cff"
+    if (options.geometry == "D94"):
+        from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+        process = cms.Process('PrintG4Solids',Phase2C20I13M9)
+    else:
+        from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+        process = cms.Process('PrintG4Solids',Phase2C17I13M9)
 
 print("Geometry file Name: ", geomFile)
 
diff --git a/SimG4Core/PrintGeomInfo/test/python/runPrintSolid_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runPrintSolid_cfg.py
index 5b4c32f4edf58..35455d1c35197 100644
--- a/SimG4Core/PrintGeomInfo/test/python/runPrintSolid_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/runPrintSolid_cfg.py
@@ -1,12 +1,39 @@
+###############################################################################
+# Way to use this:
+#   cmsRun runPrintSolid_cfg.py type=DDD
+#
+#   Options for type DDD, DD4hep
+#
+###############################################################################
 import FWCore.ParameterSet.Config as cms
+import os, sys, imp, re
+import FWCore.ParameterSet.VarParsing as VarParsing
 
-from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD
-process = cms.Process('G4PrintGeometry',Run3_DDD)
-process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
+####################################################################
+### SETUP OPTIONS
+options = VarParsing.VarParsing('standard')
+options.register('type',
+                 "DDD",
+                  VarParsing.VarParsing.multiplicity.singleton,
+                  VarParsing.VarParsing.varType.string,
+                  "type of operations: DDD, DD4hep")
 
-#from Configuration.Eras.Era_Run3_dd4hep_cff import Run3_dd4hep
-#process = cms.Process('G4PrintGeometry',Run3_dd4hep)
-#process.load('Configuration.Geometry.GeometryDD4hepExtended2021Reco_cff')
+### get and parse the command line arguments
+options.parseArguments()
+
+print(options)
+
+#####p###############################################################
+# Use the options
+
+if (options.type == "DDD"):
+    from Configuration.Eras.Era_Run3_DDD_cff import Run3_DDD
+    process = cms.Process('G4PrintGeometry',Run3_DDD)
+    process.load('Configuration.Geometry.GeometryExtended2021Reco_cff')
+else:
+    from Configuration.Eras.Era_Run3_dd4hep_cff import Run3_dd4hep
+    process = cms.Process('G4PrintGeometry',Run3_dd4hep)
+    process.load('Configuration.Geometry.GeometryDD4hepExtended2021Reco_cff')
 
 process.load('SimGeneral.HepPDTESSource.pdt_cfi')
 
diff --git a/SimG4Core/PrintGeomInfo/test/python/runSens2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runSens2026_cfg.py
index cc2e32714b30c..88031e8dc41c1 100644
--- a/SimG4Core/PrintGeomInfo/test/python/runSens2026_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/runSens2026_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun runSens2026_cfg.py geometry=D92
 #
-#   Options for geometry D88, D92, D93, D94, D95, D96, D98, D99
+#   Options for geometry D88, D91, D92, D93, D94, D95, D96, D98, D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "D92",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D94, D95, D96, D98, D99")
+                  "geometry of operations: D88, D91, D92, D93, D94, D95, D96, D98, D99")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -26,8 +26,12 @@
 #####p###############################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process('PrintSensitive',Phase2C17I13M9)
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C20I13M9)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
 
 geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
 
diff --git a/SimG4Core/PrintGeomInfo/test/python/runSummary2026_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runSummary2026_cfg.py
index f740d077c3e0c..e35cd10ae5087 100644
--- a/SimG4Core/PrintGeomInfo/test/python/runSummary2026_cfg.py
+++ b/SimG4Core/PrintGeomInfo/test/python/runSummary2026_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun runSummary2026_cfg.py geometry=D92
 #
-#   Options for geometry D88, D92, D93, D94, D95, D96, D98, D99
+#   Options for geometry D88, D91, D92, D93, D94, D95, D96, D98, D99
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "Run3",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D88, D92, D93, D94, D95, D96, D98, D99")
+                  "geometry of operations: D88, D91, D92, D93, D94, D95, D96, D98, D99")
 
 ### get and parse the command line arguments
 options.parseArguments()
@@ -26,8 +26,12 @@
 #####p###############################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process('PrintGeometry',Phase2C17I13M9)
+if (options.geometry == "D94"):
+    from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C20I13M9)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process('G4PrintGeometry',Phase2C17I13M9)
 
 geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"