diff --git a/setup/setup_sis100_electron_MAR23.C b/setup/setup_sis100_electron_MAR23.C
index 2152094f6ecfd5ee024576c027b987b92e4c15de..2f28d56835332e9e5f7e3b87c3ec78e22ac13459 100644
--- a/setup/setup_sis100_electron_MAR23.C
+++ b/setup/setup_sis100_electron_MAR23.C
@@ -23,7 +23,7 @@ void setup_sis100_electron_MAR23()
   TString magnetGeoTag    = "v22a";
   TString pipeGeoTag      = "v21d:v21i";
   TString mvdGeoTag       = "v20d_tr";
-  TString stsGeoTag       = "v21g";
+  TString stsGeoTag       = "v22c";
   TString richGeoTag      = "v22a";
   TString trdGeoTag       = "v20b_1e";
   TString tofGeoTag       = "v21a_1e";
diff --git a/setup/setup_sis100_hadron_MAR23.C b/setup/setup_sis100_hadron_MAR23.C
index 8c09fb82c13867fd6d64c16695b58e7e729beb05..0ebf0af8f862a750f454524caf35e308370f6e5b 100644
--- a/setup/setup_sis100_hadron_MAR23.C
+++ b/setup/setup_sis100_hadron_MAR23.C
@@ -22,7 +22,7 @@ void setup_sis100_hadron_MAR23()
   TString magnetGeoTag    = "v22a";
   TString pipeGeoTag      = "v21d:v21i";
   // As per discision at SWM 20220217. MVD is to be removed from hadron setup.
-  TString stsGeoTag       = "v21g";
+  TString stsGeoTag       = "v22c";
   TString trdGeoTag       = "v20c_1h";
   TString tofGeoTag       = "v21a_1h";
 //  TString psdGeoTag       = "v22c"; Paused or Removed Detector System
diff --git a/setup/setup_sis100_muon_jpsi_MAR23.C b/setup/setup_sis100_muon_jpsi_MAR23.C
index 46f7ff5cd02703f8f1663eed201751596cd3193e..4809a6a4109ce3e4e65a2bdb1448042e5bbe7ef4 100644
--- a/setup/setup_sis100_muon_jpsi_MAR23.C
+++ b/setup/setup_sis100_muon_jpsi_MAR23.C
@@ -41,8 +41,8 @@ void setup_sis100_muon_jpsi_MAR23()
 
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v22b";
-  TString pipeGeoTag      = "v21d:v21i";
-  TString stsGeoTag       = "v21g";
+  TString pipeGeoTag      = "v21d";
+  TString stsGeoTag       = "v22c";
   TString muchGeoTag      = "v21c_sis100_1m_jpsi";
   TString trdGeoTag       = "v20c_1m";
   TString tofGeoTag       = "v21a_1m";
diff --git a/setup/setup_sis100_muon_lmvm_MAR23.C b/setup/setup_sis100_muon_lmvm_MAR23.C
index d170563c14fb1eeaced54fbf7d273b9fc26dd8c0..c8ba3a9288a029e0605263480d63a956873865f1 100644
--- a/setup/setup_sis100_muon_lmvm_MAR23.C
+++ b/setup/setup_sis100_muon_lmvm_MAR23.C
@@ -38,7 +38,7 @@ void setup_sis100_muon_lmvm_MAR23()
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v22b";
   TString pipeGeoTag      = "v21d:v21i";
-  TString stsGeoTag       = "v21g";
+  TString stsGeoTag       = "v22c";
   TString muchGeoTag      = "v21c_sis100_1m_lmvm";
   TString trdGeoTag       = "v20c_1m";
   TString tofGeoTag       = "v21a_1m";