diff --git a/setup/setup_sis100_electron.C b/setup/setup_sis100_electron.C
index 12651c3ab615e6c709b071c1267e0eb79e7e5809..18cb3f0e13c97f68c962af05fa2924d7b4ca382f 100644
--- a/setup/setup_sis100_electron.C
+++ b/setup/setup_sis100_electron.C
@@ -45,7 +45,7 @@ void setup_sis100_electron()
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v21a";
   TString pipeGeoTag      = "v16e_1e";
-  TString mvdGeoTag       = "v20c_tr";
+  TString mvdGeoTag       = "v20a_tr";
   TString stsGeoTag       = "v20a";
   TString richGeoTag      = "v21a";
   TString trdGeoTag       = "v20c_1e";
diff --git a/setup/setup_sis100_hadron.C b/setup/setup_sis100_hadron.C
index ac6c5003e879eec06884e6488c0bd917316eb0f9..f3943f4278de65a5ddb730002ff6282730d66b36 100644
--- a/setup/setup_sis100_hadron.C
+++ b/setup/setup_sis100_hadron.C
@@ -8,6 +8,9 @@
  **
  **/
 
+
+
+// 2022-02-18 - EC - decided in SWM 20220217 that the mvd should be removed from hadron setup.
 // 2021-12-15 - EC - V&V all APR21 geometries are shifted by 40cm.
 // 2020-04-23 - FU - Use exported TOF geometry v16d (same as v16c but
 //                   different file format
@@ -39,7 +42,6 @@ void setup_sis100_hadron()
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v21a";
   TString pipeGeoTag      = "v16e_1e";
-  TString mvdGeoTag       = "v20c_tr";
   TString stsGeoTag       = "v20a";
   TString trdGeoTag       = "v20c_1h";
   TString tofGeoTag       = "v20c_1h";
@@ -64,7 +66,6 @@ void setup_sis100_hadron()
   setup->SetTitle("SIS100 - Hadron Setup");
   setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
   setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
-  setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag);
   setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
   setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
   setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
diff --git a/setup/setup_sis100_hadron_APR21.C b/setup/setup_sis100_hadron_APR21.C
index e734737ab803ab409300719bceedcc0242724e29..dc5d46c81ccc9046b79db17cacbfbd59a35b6bd0 100644
--- a/setup/setup_sis100_hadron_APR21.C
+++ b/setup/setup_sis100_hadron_APR21.C
@@ -8,6 +8,7 @@
  **
  **/
 
+// 2022-02-18 - EC - Decided in SWM 20220217 that mvd should be removed.
 // 2020-04-23 - FU - Use exported TOF geometry v16d (same as v16c but
 //                   different file format
 // 2017-11-24 - VF - New default v16g for STS (unit-based)
@@ -38,7 +39,6 @@ void setup_sis100_hadron_APR21()
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v20a";
   TString pipeGeoTag      = "v16b_1e";
-  TString mvdGeoTag       = "v20a_tr";
   TString stsGeoTag       = "v19a";
   TString trdGeoTag       = "v20b_1h";
   TString tofGeoTag       = "v20b_1h";
@@ -63,7 +63,6 @@ void setup_sis100_hadron_APR21()
   setup->SetTitle("SIS100 - Hadron Setup");
   setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
   setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
-  setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag);
   setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
   setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
   setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
diff --git a/setup/setup_sis100_hadron_DEC21.C b/setup/setup_sis100_hadron_DEC21.C
index d658eeb848a7c630f47d937e04d9712ff73b4985..5f56275cb430e0d1fcaa07674bc217979bc7fce3 100644
--- a/setup/setup_sis100_hadron_DEC21.C
+++ b/setup/setup_sis100_hadron_DEC21.C
@@ -39,7 +39,7 @@ void setup_sis100_hadron_DEC21()
   // -----  Geometry Tags  --------------------------------------------------
   TString magnetGeoTag    = "v21a";
   TString pipeGeoTag      = "v21d";
-  TString mvdGeoTag       = "v20d_tr";
+  // As per discision at SWM 20220217. MVD is to be removed from hadron setup.
   TString stsGeoTag       = "v21e";
   TString trdGeoTag       = "v20c_1h";
   TString tofGeoTag       = "v21a_1h";
@@ -64,7 +64,6 @@ void setup_sis100_hadron_DEC21()
   setup->SetTitle("SIS100 - Hadron Setup");
   setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
   setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
-  setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag);
   setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
   setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
   setup->SetModule(ECbmModuleId::kTof, tofGeoTag);