diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalDDD_cfg.py
index dc99fdca5f9af..e6842871ca363 100644
--- a/Geometry/HGCalCommonData/test/python/dumpHGCalDDD_cfg.py
+++ b/Geometry/HGCalCommonData/test/python/dumpHGCalDDD_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun dumpHGCalDDD_cfg.py type=V17
 #
-#   Options for type V16, V17, V17n, V17ng, V18
+#   Options for type V16, V17, V17n, V17ng, V17Shift, V18, V18n, V18ng
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,7 +16,7 @@
                  "V17",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: V16, V17, V17n, V17ng,V18")
+                  "type of operations: V16, V17, V17n, V17ng, V17Shift, V18, V18n, V18ng")
 
 ### get and parse the command line arguments
 options.parseArguments()
diff --git a/Geometry/HGCalCommonData/test/python/runHGCalTestDD4hep_cfg.py b/Geometry/HGCalCommonData/test/python/runHGCalTestDD4hep_cfg.py
index 5e1534e26bc3b..f47ad5efff839 100644
--- a/Geometry/HGCalCommonData/test/python/runHGCalTestDD4hep_cfg.py
+++ b/Geometry/HGCalCommonData/test/python/runHGCalTestDD4hep_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun runHGCalTestDD4hep_cfg.py type=V17
 #
-#   Options for type V16, V17, V17n
+#   Options for type V16, V17, V17n, V18
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,15 +16,19 @@
                  "V17",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: V16, V17, V17n")
+                  "type of operations: V16, V17, V17n, V18")
 
 ### get and parse the command line arguments
 options.parseArguments()
 print(options)
 
 from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process("HGCalTest",Phase2C17I13M9,dd4hep)
+if (options.type == "V18"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process("HGCalTest",Phase2C12213M9,dd4hep)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process("HGCalTest",Phase2C17I13M9,dd4hep)
 
 geomFile = "Geometry/HGCalCommonData/data/dd4hep/testHGCal" + options.type + ".xml"
 outFile = "file:step1" + options.type + "DD4hep.root"
diff --git a/Geometry/HGCalCommonData/test/python/runHGCalTestDDD_cfg.py b/Geometry/HGCalCommonData/test/python/runHGCalTestDDD_cfg.py
index fba9682a7a3ff..dc8a77b2a4362 100644
--- a/Geometry/HGCalCommonData/test/python/runHGCalTestDDD_cfg.py
+++ b/Geometry/HGCalCommonData/test/python/runHGCalTestDDD_cfg.py
@@ -2,7 +2,7 @@
 # Way to use this:
 #   cmsRun runHGCalTestDDD_cfg.py type=V17
 #
-#   Options for type V16, V17, V17n
+#   Options for type V16, V17, V17n, V17ng, V18, V18n, V18ng
 #
 ###############################################################################
 import FWCore.ParameterSet.Config as cms
@@ -16,14 +16,24 @@
                  "V17",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "type of operations: V16, V17, V17n")
+                  "type of operations: V16, V17, V17n, V17ng, V18, V18n, V18ng")
 
 ### get and parse the command line arguments
 options.parseArguments()
 print(options)
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-process = cms.Process("HGCalTest",Phase2C17I13M9)
+if (options.type === "V18"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process("HGCalTest",Phase2C22I13M9)
+elif (options.type === "V18n"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process("HGCalTest",Phase2C22I13M9)
+elif (options.type === "V18ng"):
+    from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+    process = cms.Process("HGCalTest",Phase2C22I13M9)
+else:
+    from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+    process = cms.Process("HGCalTest",Phase2C17I13M9)
 
 geomFile = "Geometry.HGCalCommonData.testHGCal" + options.type + "XML_cfi"
 outFile = "file:step1" + options.type + "DDD.root"
diff --git a/Geometry/HGCalCommonData/test/python/testHGCalPartialIDTester2_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalPartialIDTester2_cfg.py
index e66db43c2ebee..22234247943da 100644
--- a/Geometry/HGCalCommonData/test/python/testHGCalPartialIDTester2_cfg.py
+++ b/Geometry/HGCalCommonData/test/python/testHGCalPartialIDTester2_cfg.py
@@ -1,8 +1,8 @@
 ###############################################################################
 # Way to use this:
-#   cmsRun testHGCalPartialIDTester_cfg.py geometry=D98 type=DDD
+#   cmsRun testHGCalPartialIDTester2_cfg.py geometry=D104 type=DDD
 #
-#   Options for geometry: D104
+#   Options for geometry: D104, D106, D109
 #               type: DDD, DD4hep
 #
 ###############################################################################
@@ -17,7 +17,7 @@
                  "D104",
                   VarParsing.VarParsing.multiplicity.singleton,
                   VarParsing.VarParsing.varType.string,
-                  "geometry of operations: D104")
+                  "geometry of operations: D104, D106, D109")
 options.register('type',
                  "DDD",
                   VarParsing.VarParsing.multiplicity.singleton,
@@ -32,16 +32,16 @@
 ####################################################################
 # Use the options
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
 if (options.type == "DD4hep"):
     from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
-    process = cms.Process('Sim2026',Phase2C17I13M9,dd4hep)
+    process = cms.Process('Sim2026',Phase2C22I13M9,dd4hep)
     geomFile = "Configuration.Geometry.Geometry" + options.type +"Extended2026" + options.geometry + "Reco_cff"
 else:
-    process = cms.Process('Sim2026',Phase2C17I13M9)
+    process = cms.Process('Sim2026',Phase2C22I13M9)
     geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff"
 
-globalTag = "auto:phase2_realistic_T25"
+globalTag = "auto:phase2_realistic_T33"
 inFile = "partial" + options.geometry + ".txt"
 
 print("Geometry file: ", geomFile)
diff --git a/Geometry/HGCalCommonData/test/python/testHGCalWaferID_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalWaferID_cfg.py
index 4fc3666a43493..86c2b22dfb6a0 100644
--- a/Geometry/HGCalCommonData/test/python/testHGCalWaferID_cfg.py
+++ b/Geometry/HGCalCommonData/test/python/testHGCalWaferID_cfg.py
@@ -22,18 +22,23 @@
 options.parseArguments()
 print(options)
 
-from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
-
-process = cms.Process("HGCalWaferIDTest",Phase2C17I13M9)
+if (options.type == "V18"):
+        from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
+        process = cms.Process("HGCalWaferIDTest",Phase2C22I13M9)
+else:
+        from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
+        process = cms.Process("HGCalWaferIDTest",Phase2C17I13M9)
 
 ####################################################################
 # Use the options
-if (options.type == "V17Shift"):
+if (options.type == "V18"):
+    geomFile = "Configuration.Geometry.GeometryExtended2026D104_cff"
+elif (options.type == "V17Shift"):
     geomFile = "Geometry.HGCalCommonData.testHGCalV17ShiftReco_cff"
 elif (options.type == "V16"):
-    geomFile = "Configuration.Geometry.GeometryExtended2026D88_cff"
+    geomFile = "Configuration.Geometry.GeometryExtended2026D98_cff"
 else:
-    geomFile = "Configuration.Geometry.GeometryExtended2026D92_cff"
+    geomFile = "Configuration.Geometry.GeometryExtended2026D99_cff"
 
 print("Geometry file: ", geomFile)