diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc669c4c91bf1439dc42ac91e1b4a9e8ad30c17b..4c0dfccb4d8f29badb0c127624ff89de5a1888db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 stages:
   - build
   - test
-  - deploy
+  - coverage
 
 variables:
   CTEST_OUTPUT_ON_FAILURE: 1
@@ -9,7 +9,7 @@ variables:
 include:
   - local: '/.gitlab-ci/gcc8-seq-dbg.yml'
   - local: '/.gitlab-ci/gcc8-seq-release.yml'
-  - local: '/.gitlab-ci/clang8-seq-coverage.yml'
   - local: '/.gitlab-ci/clang8-seq-release.yml'
-  - local: '/.gitlab-ci/clang8-mpi-coverage.yml'
   - local: '/.gitlab-ci/clang8-mpi-release.yml'
+  - local: '/.gitlab-ci/clang8-seq-coverage.yml'
+  - local: '/.gitlab-ci/clang8-mpi-coverage.yml'
diff --git a/.gitlab-ci/clang8-mpi-coverage.yml b/.gitlab-ci/clang8-mpi-coverage.yml
index a299e04833f750c47c0d8f9c980fb1d49a5656f8..34d8c132238ab5f43b117ae468c045fa11e71f7b 100644
--- a/.gitlab-ci/clang8-mpi-coverage.yml
+++ b/.gitlab-ci/clang8-mpi-coverage.yml
@@ -1,24 +1,11 @@
-build:clang8-mpi-coverage:
+coverage:clang8-mpi-coverage:
   image: localhost:5000/ubuntu_clang8_mpi
-  stage: build
+  stage: coverage
   script:
     - mkdir -p build/clang8-cov-mpi
     - cd build/clang8-cov-mpi
     - CXX=clang++-8 CC=clang-8 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage -DCLANG_FORMAT=/usr/bin/clang-format-8
     - make pugs
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-clang8-cov-mpi"
-    paths:
-      - build/clang8-cov-mpi
-    untracked: true
-
-test:clang8-mpi-coverage:
-  image: localhost:5000/ubuntu_clang8_mpi
-  stage: test
-  dependencies:
-    - build:clang8-mpi-coverage
-  script:
-    - cd build/clang8-cov-mpi
     - make coverage
   cache:
     key: "${CI_COMMIT_REF_SLUG}-clang8-cov-mpi"
diff --git a/.gitlab-ci/clang8-mpi-release.yml b/.gitlab-ci/clang8-mpi-release.yml
index 1191266ac605a861c5420c5f5404c7c985fca615..92f03c34e2c852df0b62ef7c9c72421b705a2bd1 100644
--- a/.gitlab-ci/clang8-mpi-release.yml
+++ b/.gitlab-ci/clang8-mpi-release.yml
@@ -18,7 +18,9 @@ test:clang8-mpi-release:
   dependencies:
     - build:clang8-mpi-release
   script:
+    - mkdir -p build/clang8-release-mpi
     - cd build/clang8-release-mpi
+    - CXX=clang++-8 CC=clang-8 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-8
     - make run_unit_tests
   cache:
     key: "${CI_COMMIT_REF_SLUG}-clang8-release-mpi"
diff --git a/.gitlab-ci/clang8-seq-coverage.yml b/.gitlab-ci/clang8-seq-coverage.yml
index a79f27cb4802e51d87fbba2516db9225a2b4cf27..b7e407188efefe87fef4ab149460cb755b5455ce 100644
--- a/.gitlab-ci/clang8-seq-coverage.yml
+++ b/.gitlab-ci/clang8-seq-coverage.yml
@@ -1,24 +1,11 @@
-build:clang8-seq-coverage:
+coverage:clang8-seq-coverage:
   image: localhost:5000/ubuntu_clang8
-  stage: build
+  stage: coverage
   script:
     - mkdir -p build/clang8-cov
     - cd build/clang8-cov
     - CXX=clang++-8 CC=clang-8 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage -DCLANG_FORMAT=/usr/bin/clang-format-8
     - make pugs
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-clang8-cov"
-    paths:
-      - build/clang8-cov
-    untracked: true
-
-test:clang8-seq-coverage:
-  image: localhost:5000/ubuntu_clang8
-  stage: test
-  dependencies:
-    - build:clang8-seq-coverage
-  script:
-    - cd build/clang8-cov
     - make coverage
   cache:
     key: "${CI_COMMIT_REF_SLUG}-clang8-cov"
diff --git a/.gitlab-ci/clang8-seq-release.yml b/.gitlab-ci/clang8-seq-release.yml
index c12c0566457487edbc574efaa67e4ab506ea458b..acdc43a3e10be5c8fff911c8298c09327f3d4696 100644
--- a/.gitlab-ci/clang8-seq-release.yml
+++ b/.gitlab-ci/clang8-seq-release.yml
@@ -18,7 +18,9 @@ test:clang8-seq-release:
   dependencies:
     - build:clang8-seq-release
   script:
+    - mkdir -p build/clang8-release-seq
     - cd build/clang8-release-seq
+    - CXX=clang++-8 CC=clang-8 cmake ../.. -DCMAKE_BUILD_TYPE=Release -DCLANG_FORMAT=/usr/bin/clang-format-8
     - make run_unit_tests
   cache:
     key: "${CI_COMMIT_REF_SLUG}-clang8-release-seq"
diff --git a/.gitlab-ci/gcc8-seq-dbg.yml b/.gitlab-ci/gcc8-seq-dbg.yml
index fb3f5d03f3e39955c7d07a20467276d1562878e0..b8a9d91379064a24bde84b873adbf717d8380503 100644
--- a/.gitlab-ci/gcc8-seq-dbg.yml
+++ b/.gitlab-ci/gcc8-seq-dbg.yml
@@ -18,7 +18,9 @@ test:gcc8-seq-dbg:
   dependencies:
     - build:gcc8-seq-dbg
   script:
+    - mkdir -p build/gcc8-seq-dbg
     - cd build/gcc8-seq-dbg
+    - CXX=g++-8 CC=gcc-8 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
     - make run_unit_tests
   cache:
     key: "${CI_COMMIT_REF_SLUG}-gcc8-seq-dbg"
diff --git a/.gitlab-ci/gcc8-seq-release.yml b/.gitlab-ci/gcc8-seq-release.yml
index eecb64a126e257bd658001d99b790947d892b14a..516bfa2e2f4ceb0656a2394f7f0b3b50acf96d86 100644
--- a/.gitlab-ci/gcc8-seq-release.yml
+++ b/.gitlab-ci/gcc8-seq-release.yml
@@ -18,7 +18,9 @@ test:gcc8-seq-release:
   dependencies:
     - build:gcc8-seq-release
   script:
+    - mkdir -p build/gcc8-seq-release
     - cd build/gcc8-seq-release
+    - CXX=g++-8 CC=gcc-8 cmake ../.. -DCMAKE_BUILD_TYPE=Release
     - make run_unit_tests
   cache:
     key: "${CI_COMMIT_REF_SLUG}-gcc8-seq-release"