diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8210dcc26e618fce7aa7857827eb45ab63b3c72b..ef7bde9953b8f2e8e4e83dde1dfdb8d08c6fd15f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,8 +23,8 @@ variables:
       - export
       - export NUM_CORES=$(nproc --all)
       - export MAX_BUILD_CORES=$(( $(awk '( $1 == "MemTotal:" ) { print $2 }' /proc/meminfo) / ( 4 * 1024 * 1024  ) ))
-      - "[[ $MAX_BUILD_CORES -lt $NUM_CORES ]] && export NUM_BUILD_CORES=$MAX_BUILD_CORES || export NUM_BUILD_CORES=$NUM_CORES"
-      - echo "NUM_CORES = $(NUM_CORES) - NUM_BUILD_CORES =  $(NUM_BUILD_CORES)"
+      - "[[ $MAX_BUILD_CORES -lt $NUM_CORES ]] && export MAX_BUILD_CORES=$MAX_BUILD_CORES || export MAX_BUILD_CORES=$NUM_CORES"
+      - echo "NUM_CORES = $(NUM_CORES) - MAX_BUILD_CORES =  $(MAX_BUILD_CORES)"
       - $CXX --version
       - cmake --version
       - ccache --version
@@ -36,13 +36,13 @@ variables:
       - cmake .. -DWARNING_ERROR=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DPE_DIR=/builds/pe -DHYTEG_BUILD_WITH_PETSC=$HYTEG_BUILD_WITH_PETSC -DPETSC_DIR=$PETSC_DIR -DHYTEG_BUILD_WITH_EIGEN=$HYTEG_BUILD_WITH_EIGEN -DWALBERLA_SANITIZE_ADDRESS=$WALBERLA_SANITIZE_ADDRESS -DWALBERLA_SANITIZE_UNDEFINED=$WALBERLA_SANITIZE_UNDEFINED
       - cmake . -LAH
       - cd $CI_PROJECT_DIR/build/apps
-      - make -j $NUM_BUILD_CORES -l $NUM_CORES
+      - make -j $MAX_BUILD_CORES -l $NUM_CORES
       - ctest -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES
       - cd $CI_PROJECT_DIR/build/tests
-      - make -j $NUM_BUILD_CORES -l $NUM_CORES
+      - make -j $MAX_BUILD_CORES -l $NUM_CORES
       - ctest -LE $CTEST_EXCLUDE_LABELS -C $CMAKE_BUILD_TYPE --output-on-failure -j NUM_CORES
       - cd $CI_PROJECT_DIR/build/tutorials
-      - make -j $NUM_BUILD_CORES -l $NUM_CORES
+      - make -j $MAX_BUILD_CORES -l $NUM_CORES
    tags:
       - docker
 
@@ -778,12 +778,12 @@ pages:
 #
 #
 coverage:
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
    script:
       - pip3 install gcovr
       - export NUM_CORES=$(nproc --all)
       - export MAX_BUILD_CORES=$(( $(awk '( $1 == "MemTotal:" ) { print $2 }' /proc/meminfo) / ( 4 * 1024 * 1024  ) ))
-      - echo "NUM_CORES = $(NUM_CORES) - NUM_BUILD_CORES =  $(NUM_BUILD_CORES)"
+      - echo "NUM_CORES = $(NUM_CORES) - MAX_BUILD_CORES =  $(MAX_BUILD_CORES)"
       - $CXX --version
       - cmake --version
       - ccache --version
@@ -793,14 +793,15 @@ coverage:
       - mkdir build
       - cd build
       - if dpkg --compare-versions `ompi_info | head -2 | tail -1 | sed 's/[^0-9.]*\([0-9.]*\).*/\1/'` ge 1.10; then export MPIEXEC_PREFLAGS="--allow-run-as-root" ; fi
-      - cmake .. -DWARNING_ERROR=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=OFF -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DHYTEG_BUILD_WITH_PETSC=ON -DHYTEG_BUILD_WITH_TRILINOS=ON  -DWALBERLA_BUILD_WITH_GCOV=ON
+      - cmake .. -DWARNING_ERROR=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=OFF -DCMAKE_BUILD_TYPE=DebugOptimized -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DHYTEG_BUILD_WITH_PETSC=ON -DHYTEG_BUILD_WITH_TRILINOS=ON  -DCMAKE_CXX_FLAGS=--coverage
+      - cmake . -LAH
       - cd tests
-      - make -j $NUM_BUILD_CORES -l $NUM_CORES
+      - make -j $MAX_BUILD_CORES -l $NUM_CORES
       - ctest -LE $CTEST_EXCLUDE_LABELS --output-on-failure -j $NUM_CORES
       - cd ../..
       - mkdir coverage
       - pwd
-      - gcovr -r $CI_PROJECT_DIR -k build -f "src" --sort-uncovered --print-summary --html coverage/coverage.html --html-details --xml coverage/coverage.xml
+      - gcovr -r $CI_PROJECT_DIR -k build -f "src" -e ".*generatedKernels.*" --print-summary --html coverage/coverage.html --html-details --xml coverage/coverage.xml
    artifacts:
       paths:
          - coverage/
@@ -1012,4 +1013,4 @@ benchmark_gcc9:
 
 benchmark_clang8:
    <<: *benchmark_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
\ No newline at end of file
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0