diff --git a/setup/setup_sis100_cfv.C b/setup/setup_sis100_cfv.C
index 360361cb5a383e43ce312e3723c33e2aa0c8835b..b6bdcddcd27dd17cbd5510a4a1bed7b0d9353cc3 100644
--- a/setup/setup_sis100_cfv.C
+++ b/setup/setup_sis100_cfv.C
@@ -6,6 +6,7 @@
  **/
 
 // 2025-02-26 - EC - Bugfix #3510
+// 2025-02-18 - EC - Remove PSD
 // 2025-01-29 - EC - Add v24 bpipe and v25 fsd
 // 2024-11-24 - EC - Introduce CFV MVD after support added
 // 2024-11-25 - EC - Reduced CFV TRD 1D 
@@ -22,7 +23,7 @@ void setup_sis100_cfv()
   TString trdGeoTag       = "v23a_1e"; // CFV TRD 1D (reduced acceptance)
   TString tofGeoTag       = "v24a";
   TString fsdGeoTag       = "v25i"; 
-  TString psdGeoTag       = "v23a";  
+  //TString psdGeoTag       = "v23a"; https://redmine.cbm.gsi.de/issues/3533
   TString platGeoTag      = "v22b";
   // ------------------------------------------------------------------------
 
@@ -35,11 +36,12 @@ void setup_sis100_cfv()
   // -----  Create setup  ---------------------------------------------------
   CbmSetup* setup = CbmSetup::Instance();
   if ( ! setup->IsEmpty() ) {
-  	std::cout << "-W- setup_sis100_electron: overwriting existing setup"
+  	std::cout << "-W- setup_sis100_cfv: overwriting existing setup"
   			      << setup->GetTitle() << std::endl;
   	setup->Clear();
   }
-  setup->SetTitle("SIS100 - Electron Setup");
+  setup->SetTitle("SIS100 - CFV Setup");
+  setup->SetName("setup_sis100_cfv");
   setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
   setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
   setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag);
@@ -48,9 +50,10 @@ void setup_sis100_cfv()
   setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
   setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
   setup->SetModule(ECbmModuleId::kFsd, fsdGeoTag);
-  setup->SetModule(ECbmModuleId::kPsd, psdGeoTag);
+  // setup->SetModule(ECbmModuleId::kPsd, psdGeoTag);
   setup->SetModule(ECbmModuleId::kPlatform, platGeoTag);
   setup->SetField(fieldTag, fieldScale, 0., 0., fieldZ);
   // ------------------------------------------------------------------------
 
 }
+
diff --git a/setup/setup_sis100_electron.C b/setup/setup_sis100_electron.C
index f7d4940207d57f438868a3ed087dbd3b981b7214..ff17499a13560d48091aa193d6d6da7e07a15474 100644
--- a/setup/setup_sis100_electron.C
+++ b/setup/setup_sis100_electron.C
@@ -7,7 +7,7 @@
  **
  **/
 
-
+// 2025-02-18 - EC - Remove PSD.
 // 2023-11-20 - EC - Fsd as default.
 // 2023-05-01 - EC - Psd with hole for tunnel.
 // 2023-04-06 - EC - Adds different rich for Apple
@@ -35,7 +35,7 @@ void setup_sis100_electron()
   TString trdGeoTag       = "v20b_1e";
   TString tofGeoTag       = "v21a_1e";
   TString fsdGeoTag       = "v25i"; 
-  TString psdGeoTag       = "v23a";  
+  // TString psdGeoTag       = "v23a";  Removed as per request in https://redmine.cbm.gsi.de/issues/3533
   TString platGeoTag      = "v22b";
   // ------------------------------------------------------------------------
 
@@ -53,6 +53,7 @@ void setup_sis100_electron()
   	setup->Clear();
   }
   setup->SetTitle("SIS100 - Electron Setup");
+  setup->SetName("setup_sis100_electron");
   setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
   setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
   setup->SetModule(ECbmModuleId::kMvd, mvdGeoTag);
@@ -61,7 +62,7 @@ void setup_sis100_electron()
   setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
   setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
   setup->SetModule(ECbmModuleId::kFsd, fsdGeoTag);
-  setup->SetModule(ECbmModuleId::kPsd, psdGeoTag);
+  // setup->SetModule(ECbmModuleId::kPsd, psdGeoTag);
   setup->SetModule(ECbmModuleId::kPlatform, platGeoTag);
   setup->SetField(fieldTag, fieldScale, 0., 0., fieldZ);
   // ------------------------------------------------------------------------
diff --git a/setup/setup_sis100_hadron.C b/setup/setup_sis100_hadron.C
index 600ec4606146d7d70b33756b921b9f3e751d9e22..85e2e701f82044d439f58c0c347170dc3897f482 100644
--- a/setup/setup_sis100_hadron.C
+++ b/setup/setup_sis100_hadron.C
@@ -9,6 +9,7 @@
  **
  **/
 
+// 2025-02-18 - EC - Remove PSD RM #3533
 // 2025-01-29 - EC - Update beampipe
 // 2023-03-01 - EC - Default FEB23 geometries
 // 2022-08-01 - EC - Using APR21 default hadron setup as template.
@@ -27,7 +28,7 @@ void setup_sis100_hadron()
   TString stsGeoTag       = "v22d";
   TString trdGeoTag       = "v20c_1h";
   TString tofGeoTag       = "v21a_1h";
-  TString psdGeoTag       = "v22c"; // Paused or Removed Detector System, placeholder for Forward Wall Detector
+  // TString psdGeoTag       = "v22c"; // Paused or Removed Detector System, placeholder for Forward Wall Detector
   TString platGeoTag      = "v22b";
   // ------------------------------------------------------------------------
 
@@ -45,12 +46,13 @@ void setup_sis100_hadron()
   	setup->Clear();
   }
   setup->SetTitle("SIS100 - Hadron Setup");
+  setup->SetName("setup_sis100_hadron");
   setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
   setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
   setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
   setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
   setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
-  setup->SetModule(ECbmModuleId::kPsd, psdGeoTag);
+  // setup->SetModule(ECbmModuleId::kPsd, psdGeoTag);
   setup->SetModule(ECbmModuleId::kPlatform, platGeoTag);
   setup->SetField(fieldTag, fieldScale, 0., 0., fieldZ);
   // ------------------------------------------------------------------------
diff --git a/setup/setup_sis100_muon_jpsi.C b/setup/setup_sis100_muon_jpsi.C
index 34d18263f51ae87ec82108bb4e995753bab3a9cd..7bb8e1c7e03f134c2f9b4f0a7059e5474d4ca31c 100644
--- a/setup/setup_sis100_muon_jpsi.C
+++ b/setup/setup_sis100_muon_jpsi.C
@@ -68,6 +68,7 @@ void setup_sis100_muon_jpsi()
   	setup->Clear();
   }
   setup->SetTitle("SIS100 - Muon Jpsi Setup");
+  setup->SetName("setup_sis100_muon_jpsi");
   setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
   setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
   setup->SetModule(ECbmModuleId::kSts, stsGeoTag);
diff --git a/setup/setup_sis100_muon_lmvm.C b/setup/setup_sis100_muon_lmvm.C
index 3155e418709527695eae895243cf49df702846ff..66c05f15fd00977ea9398cf112ddcaaa0eb035f3 100644
--- a/setup/setup_sis100_muon_lmvm.C
+++ b/setup/setup_sis100_muon_lmvm.C
@@ -63,6 +63,7 @@ void setup_sis100_muon_lmvm()
   	setup->Clear();
   }
   setup->SetTitle("SIS100 - Muon Lmvm Setup");
+  setup->SetName("setup_sis100_muon_lmvm");
   setup->SetModule(ECbmModuleId::kMagnet, magnetGeoTag);
   setup->SetModule(ECbmModuleId::kPipe, pipeGeoTag);
   setup->SetModule(ECbmModuleId::kSts, stsGeoTag);