diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 5b5ce33d6b1be45c6044fa94a3b9fea17d0e4a8b..1c53273d2599350fed561d8e21c2fe616d446320 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,4 +1,4 @@
-set(GEOMETRY_VERSION 875439f929577d678b86bbc243b8f99a094fd31c)
+set(GEOMETRY_VERSION 83f5ffc1a886a350de6960437cdd85026ee5c666)
 
 set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
 
diff --git a/macro/mcbm/mcbm_transport.C b/macro/mcbm/mcbm_transport.C
index 202cf10ff9b6da218488b933a277afedc9457074..06d1fb43848b027b83740e798345c8e30111d8c7 100644
--- a/macro/mcbm/mcbm_transport.C
+++ b/macro/mcbm/mcbm_transport.C
@@ -19,10 +19,12 @@
 void SetTrack(CbmTransport*, Double_t, Int_t, Double_t, Double_t, Double_t);
 
 void mcbm_transport(Int_t nEvents = 10,
+                    //                  const char* setupName = "mcbm_beam_2022_03",
+                    const char* setupName = "mcbm_beam_2021_07_surveyed",
                     //                  const char* setupName = "mcbm_beam_2021_07",
                     //                  const char* setupName = "mcbm_beam_2021_04",
                     //                  const char* setupName = "mcbm_beam_2021_03",
-                    const char* setupName = "mcbm_beam_2020_03",
+                    //                  const char* setupName = "mcbm_beam_2020_03",
                     //                  const char* setupName = "mcbm_beam_2019_11",
                     //                  const char* setupName = "mcbm_beam_2019_03",
                     //                  const char* setupName = "sis18_mcbm_25deg_long",