diff --git a/StRoot/StChain/GeometryDbAliases.h b/StRoot/StChain/GeometryDbAliases.h
index 84e03344d98..a962c7f0572 100644
--- a/StRoot/StChain/GeometryDbAliases.h
+++ b/StRoot/StChain/GeometryDbAliases.h
@@ -147,24 +147,30 @@ static const DbAlias_t fDbAlias[] = {// geometry  Comment            old
 
   {"y2019",       20181215,     0, "y2019",    "y2019 development geometry, AgML,xgeometry"},   
   {"y2019a",      20181215,     1, "y2019a",   "y2019a first production release geometry, AgML,xgeometry"},   
-  {"y2019b",      20181215,     1, "y2019b",   "y2019a production geometry (FXT @ 200.7cm), AgML,xgeometry"},   
+  {"y2019b",      20181215,     2, "y2019b",   "y2019a production geometry (FXT @ 200.0cm), AgML,xgeometry"},   
 
   {"y2020",       20191120,     0, "y2020",    "y2020 development geometry, AgML,xgeometry"},   
   {"y2020a",      20191120,     1, "y2020a",   "y2020 fast-offline geometry, AgML,xgeometry"},   
-  {"y2020b",      20191120,     2, "y2020b",   "y2020 production geometry (FXT @ 200.7 cm), AgML,xgeometry"},   
+  {"y2020b",      20191120,     2, "y2020b",   "y2020 production geometry (FXT @ 200.0 cm), AgML,xgeometry"},   
 
   {"y2021",       20201215,     0, "y2021",    "y2021 development geometry, AgML,xgeometry"},   
   {"y2021a",      20201215,     1, "y2021a",   "y2021 first production geometry, AgML,xgeometry"},   
-  {"y2021b",      20201215,     2, "y2021b",   "y2021 production geometry (FXT @ 200.7 cm), AgML,xgeometry"},   
+  {"y2021b",      20201215,     2, "y2021b",   "y2021 production geometry (FXT @ 200.0 cm), AgML,xgeometry"},   
+
   
   {"y2022",       20211015,     0, "y2022",    "y2022 first cut geometry, AgML,xgeometry"},   
   {"y2022a",      20211015,     1, "y2022a",   "y2022 production geometry, AgML,xgeometry"},  
+  {"y2022b",      20211015,     2, "y2022b",   "y2022 production geometry (FXT @ 200.0 cm), AgML,xgeometry"},  
 
  { "y2023",       20230410,     0, "y2023",    "y2023 first cut geometry, AgML,xgeometry"},    
  { "y2023a",      20230410,     1, "y2023a",    "y2023a production geometry, AgML,xgeometry"},    
+ { "y2023b",      20230410,     2, "y2023b",    "y2023a production geometry (FXT @ 200.0 cm), AgML,xgeometry"},    
 
  { "y2024",       20231210,     0, "y2024",    "y2024 first cut geometry, AgML,xgeometry"},    
  { "y2024a",      20231210,     1, "y2024a",    "y2024a production geometry, AgML,xgeometry"},    
+ { "y2024b",      20231210,     2, "y2024b",    "y2024b production geometry (FXT @ 200.0 cm), AgML,xgeometry"},    
+
+ { "y2024",       20241210,     0, "y2024",    "y2024 first cut geometry, AgML,xgeometry"},    
 
   {"dev2021",     21201210,     1, "dev2021",  "-deprecated- geometry for 2021+ forward program,AgML,xgeometry"},
   {"dev2022",     21211210,     1, "dev2022",  "development geometry for 2022+ forward program,AgML,xgeometry"},
diff --git a/StarDb/AgMLGeometry/Geometry.y2021b.C b/StarDb/AgMLGeometry/Geometry.y2021b.C
new file mode 100644
index 00000000000..9f4b26ac971
--- /dev/null
+++ b/StarDb/AgMLGeometry/Geometry.y2021b.C
@@ -0,0 +1,3 @@
+class TDataSet;
+#include "CreateGeometry.h"
+TDataSet* CreateTable() { return CreateGeometry("y2021b"); }
diff --git a/StarDb/AgMLGeometry/Geometry.y2022b.C b/StarDb/AgMLGeometry/Geometry.y2022b.C
new file mode 100644
index 00000000000..2710ffad42d
--- /dev/null
+++ b/StarDb/AgMLGeometry/Geometry.y2022b.C
@@ -0,0 +1,3 @@
+class TDataSet;
+#include "CreateGeometry.h"
+TDataSet* CreateTable() { return CreateGeometry("y2022b"); }
diff --git a/StarDb/AgMLGeometry/Geometry.y2023b.C b/StarDb/AgMLGeometry/Geometry.y2023b.C
new file mode 100644
index 00000000000..64ede098ca3
--- /dev/null
+++ b/StarDb/AgMLGeometry/Geometry.y2023b.C
@@ -0,0 +1,3 @@
+class TDataSet;
+#include "CreateGeometry.h"
+TDataSet* CreateTable() { return CreateGeometry("y2023b"); }
diff --git a/StarDb/AgMLGeometry/Geometry.y2024b.C b/StarDb/AgMLGeometry/Geometry.y2024b.C
new file mode 100644
index 00000000000..667a1ecd174
--- /dev/null
+++ b/StarDb/AgMLGeometry/Geometry.y2024b.C
@@ -0,0 +1,3 @@
+class TDataSet;
+#include "CreateGeometry.h"
+TDataSet* CreateTable() { return CreateGeometry("y2024b"); }
diff --git a/StarVMC/Geometry/PipeGeo/TargConfig.xml b/StarVMC/Geometry/PipeGeo/TargConfig.xml
index 4d4f0e7ba7e..e0bf329e3fc 100644
--- a/StarVMC/Geometry/PipeGeo/TargConfig.xml
+++ b/StarVMC/Geometry/PipeGeo/TargConfig.xml
@@ -20,6 +20,11 @@
       <Init struct="TARG" var="zdis"  value="200.7" />
     </Setup>
 
+    <Setup name="TARGv1b" onoff="on" module="TargGeo" simu="2" comment="Target at z=200.0cm"   >
+      <Init struct="TARG" var="onoff" value="2" />
+      <Init struct="TARG" var="zdis"  value="200.0" />
+    </Setup>
+
       
 
     
diff --git a/StarVMC/Geometry/StarGeo.xml b/StarVMC/Geometry/StarGeo.xml
index 33c1aabb091..5e507850dc4 100644
--- a/StarVMC/Geometry/StarGeo.xml
+++ b/StarVMC/Geometry/StarGeo.xml
@@ -57,6 +57,35 @@
     <Construct sys="pres" config="PRESof" simu="2" /> 
   </Geometry>
 
+
+  <Geometry tag="y2025" comment="STAR initial production tag y2025">
+    <Construct sys="cave" config="CAVE06"  />
+    <Construct sys="upst" config="UPSTon"  />
+    <Construct sys="shld" config="SHLDon"  />
+    <Construct sys="zcal" config="ZCALon"  />
+    <Construct sys="scon" config="SCON14"  />
+    <Construct sys="pipe" config="PIPE12ft" />
+    <Construct sys="targ" config="TARGv1b"  /> 
+    <Construct sys="tpce" config="TPCEv61"  />
+    <Construct sys="btof" config="BTOFv8"  />
+    <Construct sys="vpdd" config="VPDD08"  />
+    <Construct sys="calb" config="CALB02"  />
+    <Construct sys="ecal" config="ECALv6"  />
+    <Construct sys="bbcm" config="BBCMin"  />
+    <Construct sys="epdm" config="EPDMv1"  />
+    <Construct sys="magp" config="MAGPon"  />
+    <Construct sys="mutd" config="MUTD16"  />
+    <Construct sys="wcal" config="WCALv1" simu="1" />
+    <Construct sys="hcal" config="HCALv1" simu="1" />
+    <Construct sys="plat" config="PLATon" simu="2" />
+    <Construct sys="pres" config="PRESof" simu="2" /> 
+    <Construct sys="fstm" config="FSTMv1" />
+    <Construct sys="stgm" config="STGCv1" />
+    <Construct sys="etof" config="ETOFv14f"  />
+  </Geometry>
+
+
+
   <Geometry tag="y2024" comment="STAR initial cut tag y2024">
     <Construct sys="cave" config="CAVE06"  />
     <Construct sys="upst" config="UPSTon"  />
@@ -109,6 +138,32 @@
     <Construct sys="etof" config="ETOFv14f"  />
   </Geometry>
 
+  <Geometry tag="y2024b" comment="STAR initial production tag y2024"> 
+    <Construct sys="cave" config="CAVE06"  />
+    <Construct sys="upst" config="UPSTon"  />
+    <Construct sys="shld" config="SHLDon"  />
+    <Construct sys="zcal" config="ZCALon"  />
+    <Construct sys="scon" config="SCON14"  />
+    <Construct sys="pipe" config="PIPE12ft" />
+    <Construct sys="targ" config="TARGv1b" /> 
+    <Construct sys="tpce" config="TPCEv61" />
+    <Construct sys="btof" config="BTOFv8"  />
+    <Construct sys="vpdd" config="VPDD08"  />
+    <Construct sys="calb" config="CALB02"  />
+    <Construct sys="ecal" config="ECALv6"  />
+    <Construct sys="bbcm" config="BBCMin"  />
+    <Construct sys="epdm" config="EPDMv1"  />
+    <Construct sys="magp" config="MAGPon"  />
+    <Construct sys="mutd" config="MUTD16"  />
+    <Construct sys="wcal" config="WCALv1" simu="1" />
+    <Construct sys="hcal" config="HCALv1" simu="1" />
+    <Construct sys="plat" config="PLATon" simu="2" />
+    <Construct sys="pres" config="PRESof" simu="2" /> 
+    <Construct sys="fstm" config="FSTMv1" />
+    <Construct sys="stgm" config="STGCv1" />
+    <Construct sys="etof" config="ETOFv14f"  />
+  </Geometry>
+
 
   <Geometry tag="y2023" comment="STAR initial cut tag y2023">
     <Construct sys="cave" config="CAVE06"  />
@@ -162,6 +217,32 @@
     <Construct sys="etof" config="ETOFv14f"  />
   </Geometry>
 
+  <Geometry tag="y2023b" comment="STAR initial production tag y2023">
+    <Construct sys="cave" config="CAVE06"  />
+    <Construct sys="upst" config="UPSTon"  />
+    <Construct sys="shld" config="SHLDon"  />
+    <Construct sys="zcal" config="ZCALon"  />
+    <Construct sys="scon" config="SCON14"  />
+    <Construct sys="pipe" config="PIPE12ft" />
+    <Construct sys="targ" config="TARGv1b" /> 
+    <Construct sys="tpce" config="TPCEv61" />
+    <Construct sys="btof" config="BTOFv8"  />
+    <Construct sys="vpdd" config="VPDD08"  />
+    <Construct sys="calb" config="CALB02"  />
+    <Construct sys="ecal" config="ECALv6"  />
+    <Construct sys="bbcm" config="BBCMin"  />
+    <Construct sys="epdm" config="EPDMv1"  />
+    <Construct sys="magp" config="MAGPon"  />
+    <Construct sys="mutd" config="MUTD16"  />
+    <Construct sys="wcal" config="WCALv1" simu="1" />
+    <Construct sys="hcal" config="HCALv1" simu="1" />
+    <Construct sys="plat" config="PLATon" simu="2" />
+    <Construct sys="pres" config="PRESof" simu="2" /> 
+    <Construct sys="fstm" config="FSTMv1" />
+    <Construct sys="stgm" config="STGCv1" />
+    <Construct sys="etof" config="ETOFv14f"  />
+  </Geometry>
+
   <Geometry tag="y2022" comment="STAR initial cut tag">
     <!-- Note:  Current version of sTGC has overlaps which are being resolved.  
          I anticipate updates to forward detectors during the run. -->
@@ -214,6 +295,32 @@
     <Construct sys="etof" config="ETOFv14f"  />
   </Geometry>
 
+  <Geometry tag="y2022b" comment="STAR production tag y2022">
+    <!-- Note:  Current version of sTGC has overlaps which are being resolved.  
+         I anticipate updates to forward detectors during the run. -->
+    <Construct sys="cave" config="CAVE06"  />
+    <Construct sys="upst" config="UPSTon"  />
+    <Construct sys="shld" config="SHLDon"  />
+    <Construct sys="zcal" config="ZCALon"  />
+    <Construct sys="scon" config="SCON14"  />
+    <Construct sys="pipe" config="PIPE12ft" />
+    <Construct sys="targ" config="TARGv1b" /> 
+    <Construct sys="tpce" config="TPCEv61" />
+    <Construct sys="btof" config="BTOFv8"  />
+    <Construct sys="vpdd" config="VPDD08"  />
+    <Construct sys="calb" config="CALB02"  />
+    <Construct sys="ecal" config="ECALv6"  />
+    <Construct sys="bbcm" config="BBCMin"  />
+    <Construct sys="epdm" config="EPDMv1"  />
+    <Construct sys="magp" config="MAGPon"  />
+    <Construct sys="mutd" config="MUTD16"  />
+    <Construct sys="wcal" config="WCALv1" simu="1" />
+    <Construct sys="hcal" config="HCALv1" simu="1" />
+    <Construct sys="fstm" config="FSTMv1" />
+    <Construct sys="stgm" config="STGCv1" />
+    <Construct sys="etof" config="ETOFv14f"  />
+  </Geometry>
+
 
   <Geometry tag="dev2022m" comment="development tag for the 2022 forward star upgrade (misaligned FST)">
     <Construct sys="cave" config="CAVE06"  />
@@ -324,7 +431,7 @@
     <Construct sys="etof" config="ETOFv14f"  />
   </Geometry>
 
-    <Geometry tag="y2021b" comment="STAR production tag w/ FCS installation / Fixed target at 207cm / TPC GG deadzone update">
+    <Geometry tag="y2021b" comment="STAR production tag w/ FCS installation / Fixed target at 200cm / TPC GG deadzone update">
     <Construct sys="cave" config="CAVE06"  />
     <Construct sys="upst" config="UPSTon"  />
     <Construct sys="shld" config="SHLDon"  />
@@ -332,8 +439,8 @@
     <Construct sys="scon" config="SCON14"  />
 <!-- Temporarily removed so that we do not need to introduce overlapping volumes -->
     <Construct sys="pipe" config="PIPE12ft"/>
-    <Construct sys="targ" config="TARGv1a"  /> --><!-- fixed target geometry -->
-    <Construct sys="tpce" config="TPCEv61"  />
+    <Construct sys="targ" config="TARGv1b"  /> --><!-- fixed target geometry -->
+    <Construct sys="tpce" config="TPCEv61" />
     <Construct sys="btof" config="BTOFv8"  />
     <Construct sys="vpdd" config="VPDD08"  />
     <Construct sys="calb" config="CALB02"  />
@@ -404,7 +511,7 @@
     <Construct sys="scon" config="SCON14"  />
     <!--Construct sys="pipe" config="PIPE12"-->
     <Construct sys="pipe" config="PIPE12ft" />
-    <Construct sys="targ" config="TARGv1a"  /> <!-- fixed target geometry -->
+    <Construct sys="targ" config="TARGv1b"  /> <!-- fixed target geometry -->
     <Construct sys="tpce" config="TPCEv61"  />
     <Construct sys="btof" config="BTOFv8"  />
     <Construct sys="vpdd" config="VPDD08"  />
@@ -469,7 +576,7 @@
     <Construct sys="scon" config="SCON14"  />
     <!--Construct sys="pipe" config="PIPE12"-->
     <Construct sys="pipe" config="PIPE12ft" />
-    <Construct sys="targ" config="TARGv1a"  /> <!-- fixed target geometry -->
+    <Construct sys="targ" config="TARGv1b"  /> <!-- fixed target geometry -->
     <Construct sys="tpce" config="TPCEv61"  />
     <Construct sys="btof" config="BTOFv8"  />
     <Construct sys="vpdd" config="VPDD08"  />
@@ -594,7 +701,6 @@
     <Construct sys="targ" config="TARGv1a"  /> <!-- fixed target geometry -->
   </Geometry>
 
-
   <Geometry tag="y2018x"  check="false" comment="Y2018 with experimental TPC">
 
     <Construct sys="cave" config="CAVE05"  />
diff --git a/StarVMC/xgeometry/xgeometry.age b/StarVMC/xgeometry/xgeometry.age
index 91ceeeb8d0e..b44ef02ef6e 100644
--- a/StarVMC/xgeometry/xgeometry.age
+++ b/StarVMC/xgeometry/xgeometry.age
@@ -2523,13 +2523,15 @@ If LL>0
 
   case y2018 { y2018: y2018 first cut geometry; Geom =        'y2018     '; call geom_y2018;} 
   case y2018a { y2018a: y2018 first cut geometry; Geom =        'y2018a    '; call geom_y2018a;} 
-  case y2018b { y2018a: y2018 + FXT; Geom =        'y2018b    '; call geom_y2018b;} 
-  case y2018c { y2018a: y2018 + FXT; Geom =        'y2018c    '; call geom_y2018c;} 
+  case y2018b { y2018b: y2018 + FXT; Geom =        'y2018b    '; call geom_y2018b;} 
+  case y2018c { y2018c: y2018 + FXT; Geom =        'y2018c    '; call geom_y2018c;} 
+
   case y2018x { y2018x: y2018 experimentap TPC geometry; Geom =        'y2018x    '; call geom_y2018x;} 
 
   case y2019 { y2019: y2019 first cut geometry; Geom =        'y2019     '; call geom_y2019;} 
   case y2019a { y2019: y2019a production release; Geom =        'y2019a    '; call geom_y2019a;} 
-  case y2019b { y2019: y2019a production release; Geom =        'y2019b    '; call geom_y2019b;} 
+  case y2019b { y2019: y2019b production release; Geom =        'y2019b    '; call geom_y2019b;} 
+
 
   case y2020 { y2020: y2020 first cut geometry; Geom =        'y2020     '; call geom_y2020;} 
   case y2020a { y2020a: y2020a production; Geom =        'y2020a    '; call geom_y2020a;} 
@@ -2541,12 +2543,17 @@ If LL>0
 
   case y2022 { y2022: y2022 first cut geometry; Geom =        'y2022     '; call geom_y2022;} 
   case y2022a { y2022a: y2022 first production geometry; Geom =        'y2022a    '; call geom_y2022a;} 
+  case y2022b { y2022b: y2022 first production geometry; Geom =        'y2022b    '; call geom_y2022b;} 
 
   case y2023 { y2023: y2023 first cut geometry; Geom =        'y2023     '; call geom_y2023;} 
   case y2023a { y2023a: y2023a production tag; Geom =         'y2023a    '; call geom_y2023a;} 
+  case y2023b { y2023b: y2023b production tag; Geom =         'y2023b    '; call geom_y2023b;} 
 
   case y2024 { y2024: y2024 first cut geometry; Geom =        'y2024     '; call geom_y2024;} 
-  case y2024a { y2024a: y2024a production tag; Geom =         'y2024a    '; call geom_y2024a;} 
+  case y2024a { y2024a: y2024a production tag; Geom =         'y2024a    '; call geom_y2024a;}
+  case y2024b { y2024b: y2024b production tag; Geom =         'y2024b    '; call geom_y2024b;}
+
+  case y2025 { y2025: y2025 first cut geometry; Geom =        'y2025     '; call geom_y2025;}  
 
   case dev2021 { dev2021:  First cut forward upgrades; Geom =        'dev2021   '; call geom_dev2021;} 
   case dev2022 { dev2022:  First cut forward upgrades; Geom =        'dev2022   '; call geom_dev2022;}