diff --git a/core/base/utils/CbmMcbmUtils.cxx b/core/base/utils/CbmMcbmUtils.cxx
index 1d051bd498aa4cbf8aef7c25f5c84acc39d68257..732256777e2d585cba7eb18a93c07c64322abed1 100644
--- a/core/base/utils/CbmMcbmUtils.cxx
+++ b/core/base/utils/CbmMcbmUtils.cxx
@@ -4,6 +4,8 @@
 
 #include "CbmMcbmUtils.h"
 
+#include "TString.h"
+
 #include <stdexcept>
 
 namespace cbm
@@ -22,6 +24,10 @@ namespace cbm
         /// From mCBM redmine wiki page: "run 1575: 1st run with 6 subsystems"
         throw(std::invalid_argument("RunId smaller than the earliest run mapped (1575 in 2021 campaign)"));
       }
+      else if (1575 <= ulRunId && ulRunId <= 1588) {
+        /// 2021 "CRI" runs: 1575 - 1588 = 15/07/2021
+        /// => Nothing to do, this is the default name
+      }
       /// Setup changed multiple times between the 2022 carbon and uranium runs
       else if (2060 <= ulRunId && ulRunId <= 2065) {
         /// Carbon runs: 2060 - 2065 = 10/03/2022
@@ -47,14 +53,18 @@ namespace cbm
         /// High Rate Gold runs with GEMs in Acceptance: 2498 - 2610 = 18/06/2022 - 20/06/2022
         sSetupName = "mcbm_beam_2022_06_18_gold";
       }
-      else if (2724 <= ulRunId) {
+      else if (2724 <= ulRunId && ulRunId <= 2917) {
+        /// 2024/03 Gold runs
+        sSetupName = "mcbm_beam_2024_03_22_gold";
+      }
+      else if (2918 <= ulRunId) {
         /// Dummy needed to run the unpack macro until we have a setup ready
-        /// FIXME: replace with 2024 setup!!!!!
-        sSetupName = "mcbm_beam_2022_06_16_gold";
+        /// FIXME: replace with 2024 nickel setup!!!!!
+        sSetupName = "mcbm_beam_2024_03_22_gold";
       }
-      else if (2611 < ulRunId) {
-        /// Future runs, exception there to force implementation and support from users side
-        throw(std::invalid_argument("RunId bigger than latest run mapped (2611, mCBM 2022)! Please complete the map!"));
+      else {
+        /// Missing runs, exception there to force implementation and support from users side
+        throw(std::invalid_argument(Form("RunId %d is not mapped! Please complete the map!", ulRunId)));
       }
 
       return sSetupName;