diff --git a/.gitlab-ci/clang8-mpi-coverage.yml b/.gitlab-ci/clang8-mpi-coverage.yml
index a299e04833f750c47c0d8f9c980fb1d49a5656f8..8467eacbb514c69d9e57b87cf246789274687298 100644
--- a/.gitlab-ci/clang8-mpi-coverage.yml
+++ b/.gitlab-ci/clang8-mpi-coverage.yml
@@ -6,19 +6,6 @@ build:clang8-mpi-coverage:
     - 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..c76d029cb2c99c7b702555f5c0d7a855fbf1cf6d 100644
--- a/.gitlab-ci/clang8-mpi-release.yml
+++ b/.gitlab-ci/clang8-mpi-release.yml
@@ -18,6 +18,7 @@ test:clang8-mpi-release:
   dependencies:
     - build:clang8-mpi-release
   script:
+    - mkdir -p build/clang8-release-mpi
     - cd build/clang8-release-mpi
     - make run_unit_tests
   cache:
diff --git a/.gitlab-ci/clang8-seq-coverage.yml b/.gitlab-ci/clang8-seq-coverage.yml
index a79f27cb4802e51d87fbba2516db9225a2b4cf27..aa2a4715eda8cf45f863022bd7cfbd682cfab6e5 100644
--- a/.gitlab-ci/clang8-seq-coverage.yml
+++ b/.gitlab-ci/clang8-seq-coverage.yml
@@ -6,19 +6,6 @@ build:clang8-seq-coverage:
     - 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..6316b2223adf138913fa664d1ea13f9d975696e4 100644
--- a/.gitlab-ci/clang8-seq-release.yml
+++ b/.gitlab-ci/clang8-seq-release.yml
@@ -18,6 +18,7 @@ test:clang8-seq-release:
   dependencies:
     - build:clang8-seq-release
   script:
+    - mkdir -p build/clang8-release-seq
     - cd build/clang8-release-seq
     - make run_unit_tests
   cache:
diff --git a/.gitlab-ci/gcc8-seq-dbg.yml b/.gitlab-ci/gcc8-seq-dbg.yml
index fb3f5d03f3e39955c7d07a20467276d1562878e0..441fcf5a673b4ea66cc9efe921246fa0ea665af3 100644
--- a/.gitlab-ci/gcc8-seq-dbg.yml
+++ b/.gitlab-ci/gcc8-seq-dbg.yml
@@ -18,6 +18,7 @@ test:gcc8-seq-dbg:
   dependencies:
     - build:gcc8-seq-dbg
   script:
+    - mkdir -p build/gcc8-seq-dbg
     - cd build/gcc8-seq-dbg
     - make run_unit_tests
   cache:
diff --git a/.gitlab-ci/gcc8-seq-release.yml b/.gitlab-ci/gcc8-seq-release.yml
index eecb64a126e257bd658001d99b790947d892b14a..7453a9da6bb17d5f597bfae088104e2ba2395800 100644
--- a/.gitlab-ci/gcc8-seq-release.yml
+++ b/.gitlab-ci/gcc8-seq-release.yml
@@ -18,6 +18,7 @@ test:gcc8-seq-release:
   dependencies:
     - build:gcc8-seq-release
   script:
+    - mkdir -p build/gcc8-seq-release
     - cd build/gcc8-seq-release
     - make run_unit_tests
   cache: