diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86e5b075959d45d9e691e9b1fc32f036c46e0567..d02d51ee9f33faf5249ec665fc721e79d73a2724 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,17 +83,16 @@ CodeFormatCheck:
     # comparison
     - scripts/connect_upstream_repo.sh $CI_MERGE_REQUEST_PROJECT_URL
     - git fetch upstream
-    - echo "export FAIRSOFT_VERSION=jun19p1" > env.sh
-    - echo "export FAIRROOT_VERSION=v18.2.0" >> env.sh
-    - echo "export SIMPATH=/cvmfs/fairroot.gsi.de/fairsoft/\${FAIRSOFT_VERSION}" >> env.sh
-    - echo "export FAIRROOTPATH=/cvmfs/fairroot.gsi.de/fairroot/\${FAIRROOT_VERSION}_fairsoft-\${FAIRSOFT_VERSION}" >> env.sh
+    - echo "export FAIRSOFT_VERSION=apr21p2" > env.sh
+    - echo "export FAIRROOT_VERSION=v18.6.7" >> env.sh
+    - echo "export SIMPATH=/cvmfs/fairsoft.gsi.de/debian10/fairsoft/\${FAIRSOFT_VERSION}" >> env.sh
+    - echo "export FAIRROOTPATH=/cvmfs/fairsoft.gsi.de/debian10/fairroot/\${FAIRROOT_VERSION}_fs_\${FAIRSOFT_VERSION}" >> env.sh
     - echo "export BUILDDIR=$PWD/build" >> env.sh
     - echo "export SOURCEDIR=$PWD" >> env.sh
     - echo "export PATH=/cvmfs/fairroot.gsi.de/clang-format-11.0.0/bin:\$SIMPATH/bin:$PATH" >> env.sh
     - echo "export LABEL=format-check_MR-\${CI_MERGE_REQUEST_IID}" >> env.sh
     - echo "export FAIRROOT_FORMAT_BASE=upstream/\${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}" >> env.sh
     - . ./env.sh && ctest -S cmake/scripts/checkformat.cmake -VV
-
 FileFormatCheck:
   stage: checkFormat
   image: alpine
@@ -197,8 +196,8 @@ FileLicenceCheck:
     EXTRA_PATH: /opt/cmake/3.20.1/bin
     NCPU: 16
     RAW_DATA_PATH: "/opt/cbmsoft/beamtime-test-data/reduced/"
-    FAIRSOFT_VERSION: "jun19p2_root6"
-    FAIRROOT_VERSION: "v18.2.1"
+    FAIRSOFT_VERSION: "apr21p2_root6"
+    FAIRROOT_VERSION: "v18.6.7"
     BASE_PATH: "/opt/cbmsoft"
     SIMPATH: "$BASE_PATH/fairsoft_$FAIRSOFT_VERSION/installation"
     FAIRROOTPATH: "$BASE_PATH/fairroot_${FAIRROOT_VERSION}-fairsoft_${FAIRSOFT_VERSION}"
@@ -209,13 +208,13 @@ FileLicenceCheck:
     - CbmRoot_singularity
 
 
-.singularity_debian10_variables_jun19: &singularity_debian10_variables_jun19
-    OS: debian10
-    FAIRSOFT_VERSION: jun19p2
-    FAIRROOT_VERSION: v18.2.1
-    BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
-    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
-    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
+#.singularity_debian10_variables_jun19: &singularity_debian10_variables_jun19
+#    OS: debian10
+#    FAIRSOFT_VERSION: jun19p2
+#    FAIRROOT_VERSION: v18.2.1
+#    BASE_PATH: "/cvmfs/fairsoft.gsi.de/$OS"
+#    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+#    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
 
 #.singularity_debian8_variables_jun19: &singularity_debian8_variables_jun19
 #    OS: debian8
@@ -280,16 +279,16 @@ FileLicenceCheck:
 .linux_variables: &linux_variables
     OS: "Debian10.11"
     NCPU: 5
-    FAIRSOFT_VERSION: "jun19p2"
-    FAIRROOT_VERSION: "v18.2.1"
+    FAIRSOFT_VERSION: "apr21p2"
+    FAIRROOT_VERSION: "v18.6.7"
     BASE_PATH: "/cvmfs/fairsoft.gsi.de/debian10"
     SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
     FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fs_${FAIRSOFT_VERSION}"
 
-.macosx_tag: &macosx_tag
-  stage: build
-  tags:
-    - CbmRoot_macosx
+#.macosx_tag: &macosx_tag
+#  stage: build
+#  tags:
+#    - CbmRoot_macosx
 
 #.macosx_variables: &macosx_variables
 #    OS: "macOS_10.13"
@@ -300,18 +299,18 @@ FileLicenceCheck:
 #    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
 #    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
 
-.macosx_1015_tag: &macosx_1015_tag
-  stage: build
-  tags:
-    - CbmRoot_macosx_1015
+#.macosx_1015_tag: &macosx_1015_tag
+#  stage: build
+#  tags:
+#    - CbmRoot_macosx_1015
 
-.macosx_1015_variables: &macosx_1015_variables
-    OS: "macOS_10.15"
-    FAIRSOFT_VERSION: "jun19p1"
-    FAIRROOT_VERSION: "v18.2.1"
-    BASE_PATH: "/opt"
-    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
-    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
+#.macosx_1015_variables: &macosx_1015_variables
+#    OS: "macOS_10.15"
+#    FAIRSOFT_VERSION: "jun19p1"
+#    FAIRROOT_VERSION: "v18.2.1"
+#    BASE_PATH: "/opt"
+#    SIMPATH: "$BASE_PATH/fairsoft/$FAIRSOFT_VERSION"
+#    FAIRROOTPATH: "$BASE_PATH/fairroot/${FAIRROOT_VERSION}_fairsoft-${FAIRSOFT_VERSION}"
 
 .macosx_11_tag: &macosx_11_tag
   stage: build
@@ -368,10 +367,10 @@ CbmRoot_Merge_realData:
   variables:
     <<: [*mergeRequestVariables, *realData_variables]
 
-CbmRoot_Merge_Singularity_debian10_jun19:
-  <<: [*singularity_tag, *check_merge_request, *build_and_test]
-  variables:
-    <<: [*mergeRequestVariables, *singularity_debian10_variables_jun19]
+#CbmRoot_Merge_Singularity_debian10_jun19:
+#  <<: [*singularity_tag, *check_merge_request, *build_and_test]
+#  variables:
+#    <<: [*mergeRequestVariables, *singularity_debian10_variables_jun19]
 
 #CbmRoot_Merge_Singularity_debian8_jun19:
 #  <<: [*singularity_tag, *check_merge_request, *build_and_test]
@@ -403,20 +402,20 @@ CbmRoot_Merge_Singularity_centos7_apr21:
   variables:
     <<: [*mergeRequestVariables, *singularity_centos7_variables_apr21]
 
-CbmRoot_Merge:
-  <<: [*linux_tag, *check_merge_request, *build_and_test]
-  variables:
-    <<: [*mergeRequestVariables, *linux_variables]
+#CbmRoot_Merge:
+#  <<: [*linux_tag, *check_merge_request, *build_and_test]
+#  variables:
+#    <<: [*mergeRequestVariables, *linux_variables]
 
 #CbmRoot_Merge_macosx:
 #  <<: [*macosx_tag, *check_merge_request, *build_and_test]
 #  variables:
 #    <<: [*mergeRequestVariables, *macosx_variables]
 
-CbmRoot_Merge_macosx_1015:
-  <<: [*macosx_1015_tag, *check_merge_request, *build_and_test]
-  variables:
-    <<: [*mergeRequestVariables, *macosx_1015_variables]
+#CbmRoot_Merge_macosx_1015:
+#  <<: [*macosx_1015_tag, *check_merge_request, *build_and_test]
+#  variables:
+#    <<: [*mergeRequestVariables, *macosx_1015_variables]
 
 CbmRoot_Merge_macosx_11:
   <<: [*macosx_11_tag, *check_merge_request, *build_and_test]
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 3432f40cbb5bc1b89951e001ba5eb2b88a92f08f..4d104091868e32b6cfccbeee2bad1b576baa1aa3 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -63,4 +63,5 @@ else()
   add_library(ANALYSISTREEQA SHARED IMPORTED GLOBAL)
   add_library(NICAFEMTO SHARED IMPORTED GLOBAL)
   add_library(KFPARTICLE SHARED IMPORTED GLOBAL)
+  add_library(external::yaml-cpp STATIC IMPORTED GLOBAL)
 endif()