diff --git a/setup/setup_mcbm_beam_2022_06_16_gold.C b/setup/setup_mcbm_beam_2022_06_16_gold.C
index e999daa3c4a49f6c4ea4449e5af5fbe7d152b783..ce93c3caec8cbcb49446dfacb0d280fbd712e457 100644
--- a/setup/setup_mcbm_beam_2022_06_16_gold.C
+++ b/setup/setup_mcbm_beam_2022_06_16_gold.C
@@ -8,6 +8,7 @@
 
 // clang-format off
 
+// 2024-11-21 - DE - Switch TOF from v21j to v21k, see Redmine #3478
 // 2023-06-27 - PAL- Use pre-aligned and fixed STS v22f and TOF v22j
 // 2022-11-23 - EC - remove buggy tof geo, replaced it
 // 2022-09-13 - DE - correct sensor overlap in y for STS ladder type 10
@@ -77,7 +78,7 @@ void setup_mcbm_beam_2022_06_16_gold() {
   TString trdGeoTag  = "v22h_mcbm"; // TRD-2D May 2022 + 2x TRD-1D modules
 
   // done
-  TString tofGeoTag  = "v21j_mcbm"; //
+  TString tofGeoTag  = "v21k_mcbm"; //
 
   // done
   TString richGeoTag = "v21c_mcbm"; // othogonal to z-axis
diff --git a/setup/setup_mcbm_beam_2022_06_18_gold.C b/setup/setup_mcbm_beam_2022_06_18_gold.C
index 5d322552e3f7167601a970e345fe2db1f2ab1760..e456a0bec27a73aeba93bf4fe158ddcaf7bdea2f 100644
--- a/setup/setup_mcbm_beam_2022_06_18_gold.C
+++ b/setup/setup_mcbm_beam_2022_06_18_gold.C
@@ -8,6 +8,7 @@
 
 // clang-format off
 
+// 2024-11-21 - DE - Switch TOF from v21j to v21k, see Redmine #3478
 // 2023-06-27 - PAL- Use pre-aligned and fixed STS v22f and TOF v22j
 // 2023-05-08 - VS - setup for High Rate Gold Runs 18/06/2022 to 20/06/2022.
 // 2022-11-23 - EC - remove buggy tof geo, replaced it
@@ -78,7 +79,7 @@ void setup_mcbm_beam_2022_06_18_gold() {
   TString trdGeoTag  = "v22h_mcbm"; // TRD-2D May 2022 + 2x TRD-1D modules
 
   // done
-  TString tofGeoTag  = "v21j_mcbm"; //
+  TString tofGeoTag  = "v21k_mcbm"; //
 
   // done
   TString richGeoTag = "v21c_mcbm"; // othogonal to z-axis