diff --git a/macro/mcbm/CMakeLists.txt b/macro/mcbm/CMakeLists.txt
index da22a222a66258fe3699e879ad3d883512dd8234..945dea38171292c02ade0f2b379741880932f7c1 100644
--- a/macro/mcbm/CMakeLists.txt
+++ b/macro/mcbm/CMakeLists.txt
@@ -27,12 +27,10 @@ Set(randomSeed 1)
 # Nightly if for now not different from CI so the "extras" are used only in Weekly
 If(${CBM_TEST_MODEL} MATCHES Weekly)
   List(APPEND cbm_setup mcbm_beam_2021_07_surveyed) # Default
-  List(APPEND cbm_setup mcbm_beam_2022_02 mcbm_beam_2022_03 mcbm_beam_2022_04 mcbm_beam_2022_05) # Non-default current/future setups
-#  List(APPEND cbm_setup mcbm_beam_2020_03 mcbm_beam_2021_03) # Legacy
+  List(APPEND cbm_setup mcbm_beam_2022_05_23_nickel mcbm_beam_2022_06_16_gold mcbm_beam_2022_06_18_gold mcbm_beam_2022_03_28_uranium) # Default mCBM 2022 setups
 Else()
   List(APPEND cbm_setup mcbm_beam_2021_07_surveyed) # Default
-  List(APPEND cbm_setup mcbm_beam_2022_03 ) # Non-default, representative & complete example of mCBM 2022 setups
-#  List(APPEND cbm_setup mcbm_beam_2022_02 mcbm_beam_2022_04 mcbm_beam_2022_05) # Non-default current/future setups, missing parameters
+  List(APPEND cbm_setup mcbm_beam_2022_05_23_nickel ) # Default, representative & complete example of mCBM 2022 setups
 EndIf()
 
 # =====   Cleanup the data directory   =======================================