diff --git a/MQ/mcbm/CbmDeviceUnpack.cxx b/MQ/mcbm/CbmDeviceUnpack.cxx
index 7af5795bed8f9009a8dd837b7b37bc7dd5169325..1f3f07079d5ebbe83bc68a30b5c8ea2aa4bd1816 100644
--- a/MQ/mcbm/CbmDeviceUnpack.cxx
+++ b/MQ/mcbm/CbmDeviceUnpack.cxx
@@ -393,11 +393,14 @@ Bool_t CbmDeviceUnpack::InitContainers()
           /// Uranium runs: 2176 - 2310
           parFileNameTof = "mTofCriParUranium.par";
         }
-        else if (2335 <= fuRunId) {
+        else if (2335 <= fuRunId && fuRunId <= 2497) {
           /// Nickel runs: 2335 - 2397
-          /// Gold runs: 2400 - xxxx
+          /// Gold runs: 2400 - 2497
           parFileNameTof = "mTofCriParNickel.par";
         }
+        else {
+          parFileNameTof = "mTofCriPar.par";
+        }
       }
       tofconfig->SetParFilesBasePath(parfilesbasepathTof);
       tofconfig->SetParFileName(parFileNameTof);
diff --git a/MQ/mcbm/startBuildRawEvents2022.sh.in b/MQ/mcbm/startBuildRawEvents2022.sh.in
index 52be86cfb18638b14873e959583c99c013b76778..a7c4e3684cc35b1fde219dc4c496cb87dc606f3e 100755
--- a/MQ/mcbm/startBuildRawEvents2022.sh.in
+++ b/MQ/mcbm/startBuildRawEvents2022.sh.in
@@ -61,8 +61,11 @@ else
   return -1
 fi
 
+########################################################################################################################
+
+# Setup file and parameter files for parameter server
 _parfileSts=@VMCWORKDIR@/macro/beamtime/mcbm2022/mStsPar.par
-_parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2022/mMuchPar.par  # Valid from 2163
+_parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2022/mMuchPar.par
 _parfileTrdAsic=@VMCWORKDIR@/parameters/trd/trd_v22d_mcbm.asic.par
 _parfileTrdDigi=@VMCWORKDIR@/parameters/trd/trd_v22d_mcbm.digi.par
 _parfileTrdGas=@VMCWORKDIR@/parameters/trd/trd_v22d_mcbm.gas.par
@@ -73,17 +76,66 @@ _parfileRich=@VMCWORKDIR@/macro/beamtime/mcbm2021/mRichPar_70.par
 _parfilePsd=@VMCWORKDIR@/macro/beamtime/mcbm2021/mPsdPar.par
 _setup_name=mcbm_beam_2022_03_22_iron
 
+# Parameter files => Update depending on run ID!!!
+# --> Setup
 if [ $_run_id -ge 2060 ]; then
   if [ $_run_id -le 2065 ]; then
     _setup_name=mcbm_beam_2022_03_09_carbon
-    _parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2022/mMuchParUpto26032022.par # Valid for runs 2060-2162
   elif [ $_run_id -le 2160 ]; then # Potentially wrong setup between 2065 and 2150 but not official runs
     _setup_name=mcbm_beam_2022_03_22_iron
-    _parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2022/mMuchParUpto26032022.par # Valid for runs 2060-2162
   elif [ $_run_id -le 2310 ]; then # Potentially wrong setup between 2160 and 2176 but not official runs
     _setup_name=mcbm_beam_2022_03_28_uranium
+    _parfileTrdAsic=@VMCWORKDIR@/parameters/trd/trd_v22g_mcbm.asic.par
+    _parfileTrdDigi=@VMCWORKDIR@/parameters/trd/trd_v22g_mcbm.digi.par
+    _parfileTrdGas=@VMCWORKDIR@/parameters/trd/trd_v22g_mcbm.gas.par
+    _parfileTrdGain=@VMCWORKDIR@/parameters/trd/trd_v22g_mcbm.gain.par
+  elif [ $_run_id -le 2397 ]; then # Potentially wrong setup between 2310 and 2350 but not official runs
+    _setup_name=mcbm_beam_2022_05_23_nickel
+    _parfileTrdAsic=@VMCWORKDIR@/parameters/trd/trd_v22h_mcbm.asic.par
+    _parfileTrdDigi=@VMCWORKDIR@/parameters/trd/trd_v22h_mcbm.digi.par
+    _parfileTrdGas=@VMCWORKDIR@/parameters/trd/trd_v22h_mcbm.gas.par
+    _parfileTrdGain=@VMCWORKDIR@/parameters/trd/trd_v22h_mcbm.gain.par
+  elif [ $_run_id -le 2497 ]; then # Potentially wrong setup between 2397 and 2454 but not official runs
+    _setup_name=mcbm_beam_2022_06_16_gold
+    _parfileTrdAsic=@VMCWORKDIR@/parameters/trd/trd_v22h_mcbm.asic.par
+    _parfileTrdDigi=@VMCWORKDIR@/parameters/trd/trd_v22h_mcbm.digi.par
+    _parfileTrdGas=@VMCWORKDIR@/parameters/trd/trd_v22h_mcbm.gas.par
+    _parfileTrdGain=@VMCWORKDIR@/parameters/trd/trd_v22h_mcbm.gain.par
+  fi
+fi
+# --> mMUCH
+if [ $_run_id -ge 2060 ]; then
+  if [ $_run_id -le 2162 ]; then
+    _parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2022/mMuchParUpto26032022.par # Valid for runs 2060-2162
+  elif [ $_run_id -le 2291 ]; then
+    _parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2022/mMuchParUpto03042022.par # Valid for runs 2163-2291
+  elif [ $_run_id -le 2315 ]; then
+    _parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2022/mMuchParUpto10042022.par # Valid for runs 2292-2315
+  elif [ $_run_id -le 2366 ]; then
+    _parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2022/mMuchParUpto23052022.par # Valid for runs 2316-2366
+  elif [ $_run_id -le 2397 ]; then
+    _parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2022/mMuchParUpto26052022.par # Valid for runs 2060-2162
+  else
+    _parfileMuch=@VMCWORKDIR@/macro/beamtime/mcbm2022/mMuchPar.par # Valid for runs 2398 and higher until further notice
+  fi
+fi
+# --> mTOF
+if [ $_run_id -ge 2060 ]; then
+  if [ $_run_id -le 2065 ]; then
+    _parfileTof=@VMCWORKDIR@/macro/beamtime/mcbm2022/mTofCriParCarbon.par # Valid for runs 2060-2065
+  elif [ $_run_id -le 2160 ]; then # Potentially wrong setup between 2065 and 2150 but not official runs
+    _parfileTof=@VMCWORKDIR@/macro/beamtime/mcbm2022/mTofCriParIron.par # Valid for runs 2150-2160
+  elif [ $_run_id -le 2310 ]; then # Potentially wrong setup between 2160 and 2176 but not official runs
+    _parfileTof=@VMCWORKDIR@/macro/beamtime/mcbm2022/mTofCriParUranium.par # Valid for runs 2176-2310
+  elif [ $_run_id -le 2497 ]; then # Potentially wrong setup between 2310 and 2335 but not official runs
+     # Nickel runs: 2335 - 2397
+     # Gold runs: 2400 - 2497
+    _parfileTof=@VMCWORKDIR@/macro/beamtime/mcbm2022/mTofCriParNickel.par # Valid for runs 2335-2497
+  else
+    _parfileTof=@VMCWORKDIR@/macro/beamtime/mcbm2022/mTofCriPar.par # Up to TOF team to tune for testing
   fi
 fi
+########################################################################################################################
 
 
 _ratelog=0 # hides ZMQ messages rates and bandwidth
diff --git a/macro/beamtime/mcbm2022/online/mq_parserv.sbatch b/macro/beamtime/mcbm2022/online/mq_parserv.sbatch
index fbc6b966da0a6c3126b14536d9957c5a2229e727..68b573f4885de2482e5f774899b56b74dcbe113e 100644
--- a/macro/beamtime/mcbm2022/online/mq_parserv.sbatch
+++ b/macro/beamtime/mcbm2022/online/mq_parserv.sbatch
@@ -45,30 +45,67 @@ _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22d_mcbm.gain.par
 _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriPar.par
 _parfileRich=$VMCWORKDIR/macro/beamtime/mcbm2021/mRichPar_70.par
 
+
 # Parameter files => Update depending on run ID!!!
+# --> Setup
 if [ $_run_id -ge 2060 ]; then
   if [ $_run_id -le 2065 ]; then
     _setup_name=mcbm_beam_2022_03_09_carbon
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParCarbon.par
   elif [ $_run_id -le 2160 ]; then # Potentially wrong setup between 2065 and 2150 but not official runs
     _setup_name=mcbm_beam_2022_03_22_iron
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParIron.par
   elif [ $_run_id -le 2310 ]; then # Potentially wrong setup between 2160 and 2176 but not official runs
     _setup_name=mcbm_beam_2022_03_28_uranium
     _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.asic.par
     _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.digi.par
     _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.gas.par
     _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.gain.par
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par
-  elif [ $_run_id -ge 2350 ]; then
+  elif [ $_run_id -le 2397 ]; then # Potentially wrong setup between 2310 and 2350 but not official runs
     _setup_name=mcbm_beam_2022_05_23_nickel
     _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.asic.par
     _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.digi.par
     _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gas.par
     _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gain.par
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par
+  elif [ $_run_id -le 2497 ]; then # Potentially wrong setup between 2397 and 2454 but not official runs
+    _setup_name=mcbm_beam_2022_06_16_gold
+    _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.asic.par
+    _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.digi.par
+    _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gas.par
+    _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gain.par
+  fi
+fi
+# --> mMUCH
+if [ $_run_id -ge 2060 ]; then
+  if [ $_run_id -le 2162 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto26032022.par # Valid for runs 2060-2162
+  elif [ $_run_id -le 2291 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto03042022.par # Valid for runs 2163-2291
+  elif [ $_run_id -le 2315 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto10042022.par # Valid for runs 2292-2315
+  elif [ $_run_id -le 2366 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto23052022.par # Valid for runs 2316-2366
+  elif [ $_run_id -le 2397 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto26052022.par # Valid for runs 2060-2162
+  else
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchPar.par # Valid for runs 2398 and higher until further notice
   fi
 fi
+# --> mTOF
+if [ $_run_id -ge 2060 ]; then
+  if [ $_run_id -le 2065 ]; then
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParCarbon.par # Valid for runs 2060-2065
+  elif [ $_run_id -le 2160 ]; then # Potentially wrong setup between 2065 and 2150 but not official runs
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParIron.par # Valid for runs 2150-2160
+  elif [ $_run_id -le 2310 ]; then # Potentially wrong setup between 2160 and 2176 but not official runs
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par # Valid for runs 2176-2310
+  elif [ $_run_id -le 2497 ]; then # Potentially wrong setup between 2310 and 2335 but not official runs
+     # Nickel runs: 2335 - 2397
+     # Gold runs: 2400 - 2497
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParNickel.par # Valid for runs 2335-2497
+  else
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriPar.par # Up to TOF team to tune for testing
+  fi
+fi
+
 ########################################################################################################################
 
 _ratelog=0 # hides ZMQ messages rates and bandwidth
diff --git a/macro/beamtime/mcbm2022/online/mq_processing_node.sbatch b/macro/beamtime/mcbm2022/online/mq_processing_node.sbatch
index fec21ca83f2badf7bb66dc0067f4b3af688e5ae0..2ce8af51811f271397354f3258f4a032fb9d9fc3 100644
--- a/macro/beamtime/mcbm2022/online/mq_processing_node.sbatch
+++ b/macro/beamtime/mcbm2022/online/mq_processing_node.sbatch
@@ -63,27 +63,62 @@ _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriPar.par
 _parfileRich=$VMCWORKDIR/macro/beamtime/mcbm2021/mRichPar_70.par
 
 # Parameter files => Update depending on run ID!!!
+# --> Setup
 if [ $_run_id -ge 2060 ]; then
   if [ $_run_id -le 2065 ]; then
     _setup_name=mcbm_beam_2022_03_09_carbon
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParCarbon.par
   elif [ $_run_id -le 2160 ]; then # Potentially wrong setup between 2065 and 2150 but not official runs
     _setup_name=mcbm_beam_2022_03_22_iron
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParIron.par
   elif [ $_run_id -le 2310 ]; then # Potentially wrong setup between 2160 and 2176 but not official runs
     _setup_name=mcbm_beam_2022_03_28_uranium
     _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.asic.par
     _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.digi.par
     _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.gas.par
     _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.gain.par
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par
-  elif [ $_run_id -ge 2350 ]; then
+  elif [ $_run_id -le 2397 ]; then # Potentially wrong setup between 2310 and 2350 but not official runs
     _setup_name=mcbm_beam_2022_05_23_nickel
     _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.asic.par
     _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.digi.par
     _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gas.par
     _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gain.par
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par
+  elif [ $_run_id -le 2497 ]; then # Potentially wrong setup between 2397 and 2454 but not official runs
+    _setup_name=mcbm_beam_2022_06_16_gold
+    _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.asic.par
+    _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.digi.par
+    _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gas.par
+    _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gain.par
+  fi
+fi
+# --> mMUCH
+if [ $_run_id -ge 2060 ]; then
+  if [ $_run_id -le 2162 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto26032022.par # Valid for runs 2060-2162
+  elif [ $_run_id -le 2291 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto03042022.par # Valid for runs 2163-2291
+  elif [ $_run_id -le 2315 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto10042022.par # Valid for runs 2292-2315
+  elif [ $_run_id -le 2366 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto23052022.par # Valid for runs 2316-2366
+  elif [ $_run_id -le 2397 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto26052022.par # Valid for runs 2060-2162
+  else
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchPar.par # Valid for runs 2398 and higher until further notice
+  fi
+fi
+# --> mTOF
+if [ $_run_id -ge 2060 ]; then
+  if [ $_run_id -le 2065 ]; then
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParCarbon.par # Valid for runs 2060-2065
+  elif [ $_run_id -le 2160 ]; then # Potentially wrong setup between 2065 and 2150 but not official runs
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParIron.par # Valid for runs 2150-2160
+  elif [ $_run_id -le 2310 ]; then # Potentially wrong setup between 2160 and 2176 but not official runs
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par # Valid for runs 2176-2310
+  elif [ $_run_id -le 2497 ]; then # Potentially wrong setup between 2310 and 2335 but not official runs
+     # Nickel runs: 2335 - 2397
+     # Gold runs: 2400 - 2497
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParNickel.par # Valid for runs 2335-2497
+  else
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriPar.par # Up to TOF team to tune for testing
   fi
 fi
 
diff --git a/macro/beamtime/mcbm2022/online/mq_processing_node_array.sbatch b/macro/beamtime/mcbm2022/online/mq_processing_node_array.sbatch
index 9ecd1b27ede6277bc7f4c62cd1cb3bef2313f4cd..77912adc0707c412cf58ab25965753b5cb1c2e63 100644
--- a/macro/beamtime/mcbm2022/online/mq_processing_node_array.sbatch
+++ b/macro/beamtime/mcbm2022/online/mq_processing_node_array.sbatch
@@ -53,27 +53,62 @@ _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriPar.par
 _parfileRich=$VMCWORKDIR/macro/beamtime/mcbm2021/mRichPar_70.par
 
 # Parameter files => Update depending on run ID!!!
+# --> Setup
 if [ $_run_id -ge 2060 ]; then
   if [ $_run_id -le 2065 ]; then
     _setup_name=mcbm_beam_2022_03_09_carbon
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParCarbon.par
   elif [ $_run_id -le 2160 ]; then # Potentially wrong setup between 2065 and 2150 but not official runs
     _setup_name=mcbm_beam_2022_03_22_iron
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParIron.par
   elif [ $_run_id -le 2310 ]; then # Potentially wrong setup between 2160 and 2176 but not official runs
     _setup_name=mcbm_beam_2022_03_28_uranium
     _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.asic.par
     _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.digi.par
     _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.gas.par
     _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.gain.par
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par
-  elif [ $_run_id -ge 2350 ]; then
+  elif [ $_run_id -le 2397 ]; then # Potentially wrong setup between 2310 and 2350 but not official runs
     _setup_name=mcbm_beam_2022_05_23_nickel
     _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.asic.par
     _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.digi.par
     _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gas.par
     _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gain.par
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par
+  elif [ $_run_id -le 2497 ]; then # Potentially wrong setup between 2397 and 2454 but not official runs
+    _setup_name=mcbm_beam_2022_06_16_gold
+    _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.asic.par
+    _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.digi.par
+    _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gas.par
+    _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gain.par
+  fi
+fi
+# --> mMUCH
+if [ $_run_id -ge 2060 ]; then
+  if [ $_run_id -le 2162 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto26032022.par # Valid for runs 2060-2162
+  elif [ $_run_id -le 2291 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto03042022.par # Valid for runs 2163-2291
+  elif [ $_run_id -le 2315 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto10042022.par # Valid for runs 2292-2315
+  elif [ $_run_id -le 2366 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto23052022.par # Valid for runs 2316-2366
+  elif [ $_run_id -le 2397 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto26052022.par # Valid for runs 2060-2162
+  else
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchPar.par # Valid for runs 2398 and higher until further notice
+  fi
+fi
+# --> mTOF
+if [ $_run_id -ge 2060 ]; then
+  if [ $_run_id -le 2065 ]; then
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParCarbon.par # Valid for runs 2060-2065
+  elif [ $_run_id -le 2160 ]; then # Potentially wrong setup between 2065 and 2150 but not official runs
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParIron.par # Valid for runs 2150-2160
+  elif [ $_run_id -le 2310 ]; then # Potentially wrong setup between 2160 and 2176 but not official runs
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par # Valid for runs 2176-2310
+  elif [ $_run_id -le 2497 ]; then # Potentially wrong setup between 2310 and 2335 but not official runs
+     # Nickel runs: 2335 - 2397
+     # Gold runs: 2400 - 2497
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParNickel.par # Valid for runs 2335-2497
+  else
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriPar.par # Up to TOF team to tune for testing
   fi
 fi
 
diff --git a/macro/beamtime/mcbm2022/online/mq_processing_node_dev.sbatch b/macro/beamtime/mcbm2022/online/mq_processing_node_dev.sbatch
index 9748c572b51efc3958db20bc98b4d5bfba94f1a3..34b2ef98b0d88c318c31fe2f3a5b51d163b18fe9 100644
--- a/macro/beamtime/mcbm2022/online/mq_processing_node_dev.sbatch
+++ b/macro/beamtime/mcbm2022/online/mq_processing_node_dev.sbatch
@@ -64,27 +64,62 @@ _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriPar.par
 _parfileRich=$VMCWORKDIR/macro/beamtime/mcbm2021/mRichPar_70.par
 
 # Parameter files => Update depending on run ID!!!
+# --> Setup
 if [ $_run_id -ge 2060 ]; then
   if [ $_run_id -le 2065 ]; then
     _setup_name=mcbm_beam_2022_03_09_carbon
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParCarbon.par
   elif [ $_run_id -le 2160 ]; then # Potentially wrong setup between 2065 and 2150 but not official runs
     _setup_name=mcbm_beam_2022_03_22_iron
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParIron.par
   elif [ $_run_id -le 2310 ]; then # Potentially wrong setup between 2160 and 2176 but not official runs
     _setup_name=mcbm_beam_2022_03_28_uranium
     _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.asic.par
     _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.digi.par
     _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.gas.par
     _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.gain.par
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par
-  elif [ $_run_id -ge 2350 ]; then
+  elif [ $_run_id -le 2397 ]; then # Potentially wrong setup between 2310 and 2350 but not official runs
     _setup_name=mcbm_beam_2022_05_23_nickel
     _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.asic.par
     _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.digi.par
     _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gas.par
     _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gain.par
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par
+  elif [ $_run_id -le 2497 ]; then # Potentially wrong setup between 2397 and 2454 but not official runs
+    _setup_name=mcbm_beam_2022_06_16_gold
+    _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.asic.par
+    _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.digi.par
+    _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gas.par
+    _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gain.par
+  fi
+fi
+# --> mMUCH
+if [ $_run_id -ge 2060 ]; then
+  if [ $_run_id -le 2162 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto26032022.par # Valid for runs 2060-2162
+  elif [ $_run_id -le 2291 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto03042022.par # Valid for runs 2163-2291
+  elif [ $_run_id -le 2315 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto10042022.par # Valid for runs 2292-2315
+  elif [ $_run_id -le 2366 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto23052022.par # Valid for runs 2316-2366
+  elif [ $_run_id -le 2397 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto26052022.par # Valid for runs 2060-2162
+  else
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchPar.par # Valid for runs 2398 and higher until further notice
+  fi
+fi
+# --> mTOF
+if [ $_run_id -ge 2060 ]; then
+  if [ $_run_id -le 2065 ]; then
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParCarbon.par # Valid for runs 2060-2065
+  elif [ $_run_id -le 2160 ]; then # Potentially wrong setup between 2065 and 2150 but not official runs
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParIron.par # Valid for runs 2150-2160
+  elif [ $_run_id -le 2310 ]; then # Potentially wrong setup between 2160 and 2176 but not official runs
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par # Valid for runs 2176-2310
+  elif [ $_run_id -le 2497 ]; then # Potentially wrong setup between 2310 and 2335 but not official runs
+     # Nickel runs: 2335 - 2397
+     # Gold runs: 2400 - 2497
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParNickel.par # Valid for runs 2335-2497
+  else
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriPar.par # Up to TOF team to tune for testing
   fi
 fi
 
diff --git a/macro/beamtime/mcbm2022/online/mq_servers.sbatch b/macro/beamtime/mcbm2022/online/mq_servers.sbatch
index 3d99164e89989692888a1e24730ef0bbc879a97a..a3df38d32e3c65d1e424bb8ebdcf093646105779 100644
--- a/macro/beamtime/mcbm2022/online/mq_servers.sbatch
+++ b/macro/beamtime/mcbm2022/online/mq_servers.sbatch
@@ -43,30 +43,67 @@ _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22d_mcbm.gain.par
 _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriPar.par
 _parfileRich=$VMCWORKDIR/macro/beamtime/mcbm2021/mRichPar_70.par
 
+
 # Parameter files => Update depending on run ID!!!
+# --> Setup
 if [ $_run_id -ge 2060 ]; then
   if [ $_run_id -le 2065 ]; then
     _setup_name=mcbm_beam_2022_03_09_carbon
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParCarbon.par
   elif [ $_run_id -le 2160 ]; then # Potentially wrong setup between 2065 and 2150 but not official runs
     _setup_name=mcbm_beam_2022_03_22_iron
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParIron.par
   elif [ $_run_id -le 2310 ]; then # Potentially wrong setup between 2160 and 2176 but not official runs
     _setup_name=mcbm_beam_2022_03_28_uranium
     _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.asic.par
     _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.digi.par
     _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.gas.par
     _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22g_mcbm.gain.par
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par
-  elif [ $_run_id -ge 2350 ]; then
+  elif [ $_run_id -le 2397 ]; then # Potentially wrong setup between 2310 and 2350 but not official runs
     _setup_name=mcbm_beam_2022_05_23_nickel
     _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.asic.par
     _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.digi.par
     _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gas.par
     _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gain.par
-    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par
+  elif [ $_run_id -le 2497 ]; then # Potentially wrong setup between 2397 and 2454 but not official runs
+    _setup_name=mcbm_beam_2022_06_16_gold
+    _parfileTrdAsic=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.asic.par
+    _parfileTrdDigi=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.digi.par
+    _parfileTrdGas=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gas.par
+    _parfileTrdGain=$VMCWORKDIR/parameters/trd/trd_v22h_mcbm.gain.par
+  fi
+fi
+# --> mMUCH
+if [ $_run_id -ge 2060 ]; then
+  if [ $_run_id -le 2162 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto26032022.par # Valid for runs 2060-2162
+  elif [ $_run_id -le 2291 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto03042022.par # Valid for runs 2163-2291
+  elif [ $_run_id -le 2315 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto10042022.par # Valid for runs 2292-2315
+  elif [ $_run_id -le 2366 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto23052022.par # Valid for runs 2316-2366
+  elif [ $_run_id -le 2397 ]; then
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchParUpto26052022.par # Valid for runs 2060-2162
+  else
+    _parfileMuch=$VMCWORKDIR/macro/beamtime/mcbm2022/mMuchPar.par # Valid for runs 2398 and higher until further notice
   fi
 fi
+# --> mTOF
+if [ $_run_id -ge 2060 ]; then
+  if [ $_run_id -le 2065 ]; then
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParCarbon.par # Valid for runs 2060-2065
+  elif [ $_run_id -le 2160 ]; then # Potentially wrong setup between 2065 and 2150 but not official runs
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParIron.par # Valid for runs 2150-2160
+  elif [ $_run_id -le 2310 ]; then # Potentially wrong setup between 2160 and 2176 but not official runs
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParUranium.par # Valid for runs 2176-2310
+  elif [ $_run_id -le 2497 ]; then # Potentially wrong setup between 2310 and 2335 but not official runs
+     # Nickel runs: 2335 - 2397
+     # Gold runs: 2400 - 2497
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriParNickel.par # Valid for runs 2335-2497
+  else
+    _parfileTof=$VMCWORKDIR/macro/beamtime/mcbm2022/mTofCriPar.par # Up to TOF team to tune for testing
+  fi
+fi
+
 ########################################################################################################################
 
 _ratelog=0 # hides ZMQ messages rates and bandwidth