diff --git a/macro/CMakeLists.txt b/macro/CMakeLists.txt
index 8445850d7b68214eda8bec49b173f95615c3fbc7..ffadbc3d6dfea9f7ea2201a8166269f12a15f1b4 100644
--- a/macro/CMakeLists.txt
+++ b/macro/CMakeLists.txt
@@ -56,7 +56,9 @@ Install(FILES dimuon/.rootrc dimuon/dimuon_transport.C dimuon/invM.C
        )
 Install(CODE "FILE(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/share/cbmroot/macro/dimuon/data)")
 
+# Installation only
+add_subdirectory(beamtime)
+
 #--- Deprecated (not running)
 #add_subdirectory(trd)
 #add_subdirectory(littrack)
-#add_subdirectory(beamtime)
diff --git a/macro/beamtime/CMakeLists.txt b/macro/beamtime/CMakeLists.txt
index f17f15d6756494d95201738102cf42b27e74e580..d18e7308a2101904e88cfb9701ac8903c0bc7e4b 100644
--- a/macro/beamtime/CMakeLists.txt
+++ b/macro/beamtime/CMakeLists.txt
@@ -1,34 +1,39 @@
-
-##### Old beamtime tests
-##### TODO: check if still running and cleanup if needed
-# Put the .rootrc file into the directory from which root is executed.
-# Otherwise the rootalias file is not loaded
-File(COPY ${CBMROOT_SOURCE_DIR}/macro/include/.rootrc DESTINATION ${CBMROOT_BINARY_DIR}/macro/beamtime/tests)
-
-# Define the number of events to run
-Set(NumEvents 2)
-
-If(EXISTS ${CBMROOT_SOURCE_DIR}/input/hodoTop_source_1000ts_20160422.tsa)
-  # STS Lab Setup => TSA
-  GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/beamtime/tests/FHodoLabSetup.C)
-  add_test(StsLabSetup ${CBMROOT_BINARY_DIR}/macro/beamtime/tests/FHodoLabSetup.sh)
-  SET_TESTS_PROPERTIES(StsLabSetup PROPERTIES TIMEOUT "60")
-  SET_TESTS_PROPERTIES(StsLabSetup PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
-EndIf()
-#####################
-
-##### COSY 2019 tests
-add_subdirectory(cosy2019)
-#####################
-
-
-##### mCBM 2019 tests
-add_subdirectory(mcbm2019)
-#####################
-
-##### mCBM 2020 tests: only if test TSA files for "typical runs" present
-add_subdirectory(mcbm2020)
-#####################
-
-### Copy beamtime folder to allow execution of tasks on batch farm after installation
-Install(DIRECTORY cern2016 DESTINATION share/cbmroot/macro/beamtime)
+#--- Installation only
+# mCBM 20201: install parameter files to allow execution of unpacking on Virgo/Lustre
+add_subdirectory(mcbm2021)
+
+################################################################################
+#--- Deprecated (not running)
+###### Old beamtime tests
+###### TODO: check if still running and cleanup if needed
+## Put the .rootrc file into the directory from which root is executed.
+## Otherwise the rootalias file is not loaded
+#File(COPY ${CBMROOT_SOURCE_DIR}/macro/include/.rootrc DESTINATION ${CBMROOT_BINARY_DIR}/macro/beamtime/tests)
+#
+## Define the number of events to run
+#Set(NumEvents 2)
+#
+#If(EXISTS ${CBMROOT_SOURCE_DIR}/input/hodoTop_source_1000ts_20160422.tsa)
+  ## STS Lab Setup => TSA
+  #GENERATE_ROOT_TEST_SCRIPT(${CBMROOT_SOURCE_DIR}/macro/beamtime/tests/FHodoLabSetup.C)
+  #add_test(StsLabSetup ${CBMROOT_BINARY_DIR}/macro/beamtime/tests/FHodoLabSetup.sh)
+  #SET_TESTS_PROPERTIES(StsLabSetup PROPERTIES TIMEOUT "60")
+  #SET_TESTS_PROPERTIES(StsLabSetup PROPERTIES PASS_REGULAR_EXPRESSION "Test Passed;All ok")
+#EndIf()
+######################
+#
+###### COSY 2019 tests
+#add_subdirectory(cosy2019)
+######################
+#
+#
+###### mCBM 2019 tests
+#add_subdirectory(mcbm2019)
+######################
+#
+###### mCBM 2020 tests: only if test TSA files for "typical runs" present
+#add_subdirectory(mcbm2020)
+#
+#### Copy beamtime folder to allow execution of tasks on batch farm after installation
+#Install(DIRECTORY cern2016 DESTINATION share/cbmroot/macro/beamtime)
+################################################################################
diff --git a/macro/beamtime/mcbm2021/CMakeLists.txt b/macro/beamtime/mcbm2021/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..216abf5dbc01d17eec13b3c3f71a326be57cc559
--- /dev/null
+++ b/macro/beamtime/mcbm2021/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+Install(FILES mMuchPar.par mPsdPar.par mRichPar.par mRichPar_70.par mStsPar.par mT0Par.par mTofPar.par mTofCriPar.par
+              mTofPar2Stack.par mTofPar2.par mTofParMay.par
+        DESTINATION share/cbmroot/macro/beamtime/mcbm2021/
+       )