diff --git a/Validation/HGCalValidation/scripts/testHGCalCellHitSum_cfg.py b/Validation/HGCalValidation/scripts/testHGCalCellHitSum_cfg.py
index fad35c65b6ecb..dac1f679a6746 100644
--- a/Validation/HGCalValidation/scripts/testHGCalCellHitSum_cfg.py
+++ b/Validation/HGCalValidation/scripts/testHGCalCellHitSum_cfg.py
@@ -2,13 +2,13 @@
 # Way to use this:
 #   cmsRun testHGCalCellHitSum_cfg.py geometry=D121 layers=1 type=mu
 #
-#   Options for geometry D105, D110, D114
+#   Options for geometry D104, D110, D114, D121
 #               layers '1', '1,2', any combination from 1..47           
 #               type mu, tt
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
-import os, sys, imp, re
+import os, sys, re
 import FWCore.ParameterSet.VarParsing as VarParsing
 
 ####################################################################
@@ -18,7 +18,7 @@
                  "D121",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D105, D114, D121")
+                  "geometry of operations: D104, D110, D114, D121")
 
 options.register('layers',
                  "1",
@@ -35,30 +35,33 @@
 ### get and parse the command line arguments
 options.parseArguments()
 
-import FWCore.ParameterSet.Config as cms
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process('HGCalCellHit',Phase2C17I13M9)
+geomName = "Run4" + options.geometry
+loadFile = "Configuration.Geometry.GeometryExtended" + geomName + "Reco_cff"
+import Configuration.Geometry.defaultPhase2ConditionsEra_cff as _settings
+GLOBAL_TAG, ERA = _settings.get_era_and_conditions(geomName)
+
+process = cms.Process('HGCalCellHit',ERA)
 
 print(options)
 
 ####################################################################
 # Use the options
 
-loadFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff"
 inputFile = "file:step1" + options.geometry + options.type + ".root"
 outputFile = "file:geantoutput" + options.geometry + options.type + ".root"
 
-if (options.geometry == "D105"):
-    geomFile = 'Validation/HGCalValidation/data/wafer_v16.csv'
-elif (options.geometry == "D114"):
+if (options.geometry == "D114"):
     geomFile = 'Validation/HGCalValidation/data/wafer_v17.csv'
 else:
     geomFile = 'Validation/HGCalValidation/data/wafer_v17.csv'
 
-print("Geometry file: ", loadFile)
-print("Wafer file:    ", geomFile)
-print("Input file:    ", inputFile)
-print("Output file:   ", outputFile)
+print("Geometry Name:   ", geomName)
+print("Geometry file:   ", loadFile)
+print("Wafer file:      ", geomFile)
+print("Input file:      ", inputFile)
+print("Output file:     ", outputFile)
+print("Global Tag Name: ", GLOBAL_TAG)
+print("Era Name:        ", ERA)
 
 process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi')
 process.load(loadFile)
diff --git a/Validation/HGCalValidation/scripts/testHGCalDigi_cfg.py b/Validation/HGCalValidation/scripts/testHGCalDigi_cfg.py
index c29f9d5608357..f90620de2262b 100644
--- a/Validation/HGCalValidation/scripts/testHGCalDigi_cfg.py
+++ b/Validation/HGCalValidation/scripts/testHGCalDigi_cfg.py
@@ -3,7 +3,7 @@
 #   cmsRun testHGCalDigi_cfg.py geometry=D111 type=DDD data=mu noise=none
 #                               threshold=none
 #
-#   Options for geometry: D105, D111, D114, V17Shift, D104
+#   Options for geometry: D121, D111, D114, V17Shift, D104
 #               type: DDD, DD4hep
 #               data: mu, tt
 #               noise: none, ok
@@ -18,10 +18,10 @@
 ### SETUP OPTIONS
 options = VarParsing.VarParsing('standard')
 options.register('geometry',
-                 "D111",
+                 "D121",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D105, D111, D114, V17Shift, D104")
+                  "geometry of operations: D121, D111, D114, V17Shift, D104")
 options.register('type',
                  "DDD",
                   VarParsing.VarParsing.multiplicity.singleton,
diff --git a/Validation/HGCalValidation/scripts/testHGCalMTRecoStudy_cfg.py b/Validation/HGCalValidation/scripts/testHGCalMTRecoStudy_cfg.py
index 2481912ea64e4..428d9a5e3d043 100644
--- a/Validation/HGCalValidation/scripts/testHGCalMTRecoStudy_cfg.py
+++ b/Validation/HGCalValidation/scripts/testHGCalMTRecoStudy_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun runHGCalRecHitStudy_cfg.py geometry=D121
 #
-#   Options for geometry D105, D114,D120, D121
+#   Options for geometry D114, D120, D121
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -19,7 +19,7 @@
                  "D121",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D105, D114, D121")
+                  "geometry of operations: D110, D114, D121")
 
 options.register('layers',
                  "1",
@@ -39,23 +39,23 @@
 
 fileInput = "file:step3.root"
 
-if (options.geometry == "D105"):
-    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-    process = cms.Process('HGCalMTReco',Phase2C17I13M9)
-    process.load('Configuration.Geometry.GeometryExtendedRun4D105Reco_cff')
-    outputFile = 'file:recoutputD105.root'
-elif (options.geometry == "D114"):
+if (options.geometry == "D114"):
     from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
     process = cms.Process('HGCalMTReco',Phase2C17I13M9)
     process.load('Configuration.Geometry.GeometryExtendedRun4D114Reco_cff')
     outputFile = 'file:recoutputD114.root'
+elif (options.geometry == "D110"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process('HGCalMTReco',Phase2C22I13M9)
+    process.load('Configuration.Geometry.GeometryExtendedRun4D110Reco_cff')
+    outputFile = 'file:recoutputD110.root'
 elif (options.geometry == "D121"):
     from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
     process = cms.Process('HGCalMTReco',Phase2C22I13M9)
     process.load('Configuration.Geometry.GeometryExtendedRun4D121Reco_cff')
     outputFile = 'file:recoutputD121.root'
 else:
-    print("Please select a valid geometry version e.g. D105, D114, D121....")
+    print("Please select a valid geometry version e.g. D110, D114, D121....")
 
 print("Input file: ", fileInput)
 print("Output file: ", outputFile)
diff --git a/Validation/HGCalValidation/scripts/testHGCalReco_cfg.py b/Validation/HGCalValidation/scripts/testHGCalReco_cfg.py
index 57c41cf4149ae..394642e539ad3 100644
--- a/Validation/HGCalValidation/scripts/testHGCalReco_cfg.py
+++ b/Validation/HGCalValidation/scripts/testHGCalReco_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun testHGCalDigi_cfg.py geometry=D121 type=DDD data=mu tag=Def
 #
-#   Options for geometry: D105, D114, V17Shift, D104, D121
+#   Options for geometry: D110, D114, V17Shift, D104, D121
 #               type: DDD, DD4hep
 #               data: mu, tt
 #               tag: Def, Thr, 0Noise
@@ -19,7 +19,7 @@
                  "D121",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D105, D121, D114, V17Shift, D104")
+                  "geometry of operations: D110, D121, D114, V17Shift, D104")
 options.register('type',
                  "DDD",
                   VarParsing.VarParsing.multiplicity.singleton,
diff --git a/Validation/HGCalValidation/scripts/testHGCalSimSingleMuonPt100_cfg.py b/Validation/HGCalValidation/scripts/testHGCalSimSingleMuonPt100_cfg.py
index ad5ea73ed1174..8aab9127fe125 100644
--- a/Validation/HGCalValidation/scripts/testHGCalSimSingleMuonPt100_cfg.py
+++ b/Validation/HGCalValidation/scripts/testHGCalSimSingleMuonPt100_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun testHGCalSingleMuonPt100_cfg.py geometry=D110 type=DDD
 #
-#   Options for geometry: D105, D121, D114, V17Shift, D104
+#   Options for geometry: D110, D121, D114, V17Shift, D104
 #               type: DDD, DD4hep
 #
 ###############################################################################
@@ -17,7 +17,7 @@
                  "D121",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D105, D121, D114, V17Shift, D104")
+                  "geometry of operations: D110, D121, D114, V17Shift, D104")
 options.register('type',
                  "DDD",
                   VarParsing.VarParsing.multiplicity.singleton,
diff --git a/Validation/HGCalValidation/scripts/testHGCalSimTTBar_cfg.py b/Validation/HGCalValidation/scripts/testHGCalSimTTBar_cfg.py
index 61fdd4d348612..dd12b64833122 100644
--- a/Validation/HGCalValidation/scripts/testHGCalSimTTBar_cfg.py
+++ b/Validation/HGCalValidation/scripts/testHGCalSimTTBar_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun testHGCalTTBar_cfg.py geometry=D110 type=DDD
 #
-#   Options for geometry: D105, D121, D114, V17Shift, D104
+#   Options for geometry: D110, D121, D114, V17Shift, D104
 #               type: DDD, DD4hep
 #
 ###############################################################################
@@ -17,7 +17,7 @@
                  "D121",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D105, D121, D114, V17Shift, D104")
+                  "geometry of operations: D110, D121, D114, V17Shift, D104")
 options.register('type',
                  "DDD",
                   VarParsing.VarParsing.multiplicity.singleton,