diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d39c99d..10e5817 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,69 +1,83 @@
 stages:
   - build
   - test
 
+variables:
+  LCG_VERSION: 98
+
 .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-opt; set -e
+    - 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_INSTALL_PREFIX:PATH=../install -DEVTGEN_HEPMC3:BOOL=ON -DEVTGEN_PYTHIA:BOOL=ON -DEVTGEN_PHOTOS:BOOL=ON -DEVTGEN_TAUOLA:BOOL=ON -DEVTGEN_BUILD_TESTS:BOOL=ON ..
+    - cmake -DCMAKE_BUILD_TYPE:STRING=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX:PATH=../install -DEVTGEN_HEPMC3:BOOL=ON -DEVTGEN_PYTHIA:BOOL=ON -DEVTGEN_PHOTOS:BOOL=ON -DEVTGEN_TAUOLA:BOOL=ON -DEVTGEN_BUILD_TESTS:BOOL=$BUILD_TESTS ..
     - cmake --build .
     - cmake --build . --target install
 
-build_LCG98_gcc10:
+build_clang10_opt:
   variables:
-    LCG_VERSION: 98
-    LCG_COMPILER: gcc10
+    LCG_COMPILER: clang10-opt
+    BUILD_TYPE: Release
+    BUILD_TESTS: OFF
+  extends:
+    - .production_image
+    - .build_template
+
+build_gcc10_opt:
+  variables:
+    LCG_COMPILER: gcc10-opt
+    BUILD_TYPE: Release
+    BUILD_TESTS: OFF
   extends:
     - .production_image
     - .build_template
   allow_failure: true
 
-build_LCG98_gcc9:
+build_gcc9_opt:
   variables:
-    LCG_VERSION: 98
-    LCG_COMPILER: gcc9
+    LCG_COMPILER: gcc9-opt
+    BUILD_TYPE: Release
+    BUILD_TESTS: OFF
   extends:
     - .production_image
     - .build_template
-  artifacts:
-    paths:
-      - install
-    expire_in: 1 day
 
-build_LCG98_clang10:
+build_gcc9_dbg:
   variables:
-    LCG_VERSION: 98
-    LCG_COMPILER: clang10
+    LCG_COMPILER: gcc9-dbg
+    BUILD_TYPE: Debug
+    BUILD_TESTS: ON
   extends:
     - .production_image
     - .build_template
+  artifacts:
+    paths:
+      - install
+    expire_in: 1 day
 
 test_placeholder:
   stage: test
   variables:
-    LCG_VERSION: 98
-    LCG_COMPILER: gcc9
+    LCG_COMPILER: gcc9-dbg
   extends:
     - .production_image
     - .lcg_setup
   dependencies:
-    - build_LCG98_gcc9
+    - build_gcc9_dbg
   script:
     - cd install/share/EvtGen/test
     - ls -al
     - ./testDecayModel jsonFiles/BppmunuQCD.json