diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c4a2e8..53abf18 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,160 +1,152 @@
 stages:
   - build
   - test
 
 variables:
-  LCG_VERSION: "98"
+  LCG_VERSION: "98python3"
+  BUILD_TYPE: "Release"
   BUILD_ROOFIT_TASK: "OFF"
+  BUILD_DOCS: "OFF"
 
 .production_image:
   variables:
     LCG_OS: x86_64-centos7
   image: gitlab-registry.cern.ch/ci-tools/ci-worker:cc7
   tags:
     - cvmfs
 
 .lcg_setup:
   before_script:
     - set +e && source /cvmfs/sft.cern.ch/lcg/views/setupViews.sh LCG_$LCG_VERSION $LCG_OS-$LCG_COMPILER; set -e
 
 .build_template:
   stage: build
   extends:
     - .lcg_setup
   script:
     - mkdir install
     - mkdir build && cd build
-    - cmake -DCMAKE_BUILD_TYPE:STRING=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/install -DLAURA_BUILD_EXAMPLES:BOOL=ON -DLAURA_BUILD_DOCS:BOOL=ON -DLAURA_BUILD_ROOFIT_TASK:BOOL=$BUILD_ROOFIT_TASK $CI_PROJECT_DIR
+    - cmake -DCMAKE_BUILD_TYPE:STRING=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR/install -DLAURA_BUILD_EXAMPLES:BOOL=ON -DLAURA_BUILD_DOCS:BOOL=$BUILD_DOCS -DLAURA_BUILD_ROOFIT_TASK:BOOL=$BUILD_ROOFIT_TASK $CI_PROJECT_DIR
     - cmake --build .
     - cmake --build . --target install
 
 build_clang10_opt:
   variables:
     LCG_COMPILER: "clang10-opt"
-    BUILD_TYPE: "Release"
   extends:
     - .production_image
     - .build_template
 
 build_gcc10_opt:
   variables:
     LCG_COMPILER: "gcc10-opt"
-    BUILD_TYPE: "Release"
-    BUILD_ROOFIT_TASK: "ON"
   extends:
     - .production_image
     - .build_template
-  allow_failure: true
 
-build_gcc9_opt:
+build_gcc10_dbg:
   variables:
-    LCG_COMPILER: "gcc9-opt"
-    BUILD_TYPE: "Release"
-  extends:
-    - .production_image
-    - .build_template
-
-build_gcc9_dbg:
-  variables:
-    LCG_COMPILER: "gcc9-dbg"
+    LCG_COMPILER: "gcc10-dbg"
     BUILD_TYPE: "Debug"
+    BUILD_ROOFIT_TASK: "ON"
+    BUILD_DOCS: "ON"
   extends:
     - .production_image
     - .build_template
   artifacts:
     paths:
       - install
     expire_in: 1 day
 
 .test_template:
   stage: test
   variables:
-    LCG_COMPILER: "gcc9-dbg"
+    LCG_COMPILER: "gcc10-dbg"
   extends:
     - .production_image
     - .lcg_setup
   dependencies:
-    - build_gcc9_dbg
+    - build_gcc10_dbg
   artifacts:
     paths:
       - runtests
     expire_in: 1 day
   script:
     - export PATH=$CI_PROJECT_DIR/install/bin:$PATH
     - mkdir runtests && cd runtests
     - curl -o ft-eta-hist.root https://laura.hepforge.org/CI-files/ft-eta-hist-realistic.root
     - curl -O https://laura.hepforge.org/CI-files/dta-hist.root
     - curl -O https://laura.hepforge.org/CI-files/dte-hist.root
     - $CI_PROJECT_DIR/examples/runTimeDepTest.sh 0 $DTA_MODEL $DTR $DTR_PEREVENT
 
 test_flatDTA_noDTR:
   variables:
     DTA_MODEL: "flat"
     DTR: "0"
     DTR_PEREVENT: "0"
   extends:
     - .test_template
 
 test_flatDTA_avgDTR:
   variables:
     DTA_MODEL: "flat"
     DTR: "1"
     DTR_PEREVENT: "0"
   extends:
     - .test_template
 
 test_flatDTA_evtDTR:
   variables:
     DTA_MODEL: "flat"
     DTR: "1"
     DTR_PEREVENT: "1"
   extends:
     - .test_template
 
 test_histDTA_noDTR:
   variables:
     DTA_MODEL: "hist"
     DTR: "0"
     DTR_PEREVENT: "0"
   extends:
     - .test_template
 
 test_histDTA_avgDTR:
   variables:
     DTA_MODEL: "hist"
     DTR: "1"
     DTR_PEREVENT: "0"
   extends:
     - .test_template
 
 test_histDTA_evtDTR:
   variables:
     DTA_MODEL: "hist"
     DTR: "1"
     DTR_PEREVENT: "1"
   extends:
     - .test_template
 
 test_splineDTA_noDTR:
   variables:
     DTA_MODEL: "spline"
     DTR: "0"
     DTR_PEREVENT: "0"
   extends:
     - .test_template
 
 test_splineDTA_avgDTR:
   variables:
     DTA_MODEL: "spline"
     DTR: "1"
     DTR_PEREVENT: "0"
   extends:
     - .test_template
 
 test_splineDTA_evtDTR:
   variables:
     DTA_MODEL: "spline"
     DTR: "1"
     DTR_PEREVENT: "1"
   extends:
     - .test_template