diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f671870172e5c0601b23c3fdba31a4085c07b01f..3da17a2290dc83b04f5604676b48d5914e88c378 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,11 +7,11 @@ variables:
   CTEST_OUTPUT_ON_FAILURE: 1
 
 include:
-  - local: '/.gitlab-ci/gcc8-seq-dbg.yml'
-  - local: '/.gitlab-ci/gcc8-seq-release.yml'
-  - local: '/.gitlab-ci/clang10-seq-release.yml'
+  - local: '/.gitlab-ci/clang10-mpi-debug.yml'
   - local: '/.gitlab-ci/clang10-mpi-release.yml'
-  - local: '/.gitlab-ci/clang10-seq-coverage.yml'
-  - local: '/.gitlab-ci/clang10-mpi-coverage.yml'
-  - local: '/.gitlab-ci/gcc10-seq-release.yml'
+  - local: '/.gitlab-ci/clang10-seq-release.yml'
+  - local: '/.gitlab-ci/gcc10-mpi-debug.yml'
+  - local: '/.gitlab-ci/gcc10-mpi-coverage.yml'
   - local: '/.gitlab-ci/gcc10-mpi-release.yml'
+  - local: '/.gitlab-ci/gcc10-seq-coverage.yml'
+  - local: '/.gitlab-ci/gcc10-seq-release.yml'
diff --git a/.gitlab-ci/clang10-mpi-coverage.yml b/.gitlab-ci/clang10-mpi-coverage.yml
deleted file mode 100644
index 8d18ed109e0d929a7a66dcd44885eee8dbc55d68..0000000000000000000000000000000000000000
--- a/.gitlab-ci/clang10-mpi-coverage.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-coverage:clang10-mpi-coverage:
-  image: localhost:5000/ubuntu_clang10_mpi
-  stage: coverage
-  script:
-    - mkdir -p build/clang10-cov-mpi
-    - cd build/clang10-cov-mpi
-    - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage -DCLANG_FORMAT=/usr/bin/clang-format-10
-    - make pugs
-    - make coverage
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-clang10-cov-mpi"
-    paths:
-      - build/clang10-cov-mpi
-    untracked: true
diff --git a/.gitlab-ci/clang10-mpi-debug.yml b/.gitlab-ci/clang10-mpi-debug.yml
new file mode 100644
index 0000000000000000000000000000000000000000..116a3f1034cd679352569680a09d878b31b83c73
--- /dev/null
+++ b/.gitlab-ci/clang10-mpi-debug.yml
@@ -0,0 +1,29 @@
+build:clang10-mpi-debug:
+  image: localhost:5000/ubuntu_clang10_mpi
+  stage: build
+  needs: []
+  script:
+    - mkdir -p build/clang10-debug-mpi
+    - cd build/clang10-debug-mpi
+    - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
+    - make pugs
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}-clang10-debug-mpi"
+    paths:
+      - build/clang10-debug-mpi
+    untracked: true
+
+test:clang10-mpi-debug:
+  image: localhost:5000/ubuntu_clang10_mpi
+  stage: test
+  needs: ["build:clang10-mpi-debug"]
+  script:
+    - mkdir -p build/clang10-debug-mpi
+    - cd build/clang10-debug-mpi
+    - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
+    - make run_unit_tests
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}-clang10-debug-mpi"
+    paths:
+      - build/clang10-debug-mpi
+    untracked: true
diff --git a/.gitlab-ci/clang10-seq-coverage.yml b/.gitlab-ci/clang10-seq-coverage.yml
deleted file mode 100644
index c9bb772d63cabed996f3fe3834e858aded8cef4b..0000000000000000000000000000000000000000
--- a/.gitlab-ci/clang10-seq-coverage.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-coverage:clang10-seq-coverage:
-  image: localhost:5000/ubuntu_clang10
-  stage: coverage
-  script:
-    - mkdir -p build/clang10-cov
-    - cd build/clang10-cov
-    - CXX=clang++-10 CC=clang-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage -DCLANG_FORMAT=/usr/bin/clang-format-10
-    - make pugs
-    - make coverage
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-clang10-cov"
-    paths:
-      - build/clang10-cov
-    untracked: true
diff --git a/.gitlab-ci/gcc10-mpi-coverage.yml b/.gitlab-ci/gcc10-mpi-coverage.yml
new file mode 100644
index 0000000000000000000000000000000000000000..156592e9f4c080b545915a5e9a7aecef96ce3d2e
--- /dev/null
+++ b/.gitlab-ci/gcc10-mpi-coverage.yml
@@ -0,0 +1,14 @@
+coverage:gcc10-mpi-coverage:
+  image: localhost:5000/ubuntu_gcc10_mpi
+  stage: coverage
+  script:
+    - mkdir -p build/gcc10-cov-mpi
+    - cd build/gcc10-cov-mpi
+    - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage
+    - make pugs
+    - make coverage
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}-gcc10-cov-mpi"
+    paths:
+      - build/gcc10-cov-mpi
+    untracked: true
diff --git a/.gitlab-ci/gcc10-mpi-debug.yml b/.gitlab-ci/gcc10-mpi-debug.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6dd2806678651be82e4e2defdbb0c57ea2597f79
--- /dev/null
+++ b/.gitlab-ci/gcc10-mpi-debug.yml
@@ -0,0 +1,29 @@
+build:gcc10-mpi-debug:
+  image: localhost:5000/ubuntu_gcc10_mpi
+  stage: build
+  needs: []
+  script:
+    - mkdir -p build/gcc10-debug-mpi
+    - cd build/gcc10-debug-mpi
+    - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
+    - make pugs
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}-gcc10-debug-mpi"
+    paths:
+      - build/gcc10-debug-mpi
+    untracked: true
+
+test:gcc10-mpi-debug:
+  image: localhost:5000/ubuntu_gcc10_mpi
+  stage: test
+  needs: ["build:gcc10-mpi-debug"]
+  script:
+    - mkdir -p build/gcc10-debug-mpi
+    - cd build/gcc10-debug-mpi
+    - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
+    - make run_unit_tests
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}-gcc10-debug-mpi"
+    paths:
+      - build/gcc10-debug-mpi
+    untracked: true
diff --git a/.gitlab-ci/gcc10-seq-coverage.yml b/.gitlab-ci/gcc10-seq-coverage.yml
new file mode 100644
index 0000000000000000000000000000000000000000..663798274b0c465892c78084dde56022b151b1ba
--- /dev/null
+++ b/.gitlab-ci/gcc10-seq-coverage.yml
@@ -0,0 +1,14 @@
+coverage:gcc10-seq-coverage:
+  image: localhost:5000/ubuntu_gcc10
+  stage: coverage
+  script:
+    - mkdir -p build/gcc10-cov
+    - cd build/gcc10-cov
+    - CXX=g++-10 CC=gcc-10 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage
+    - make pugs
+    - make coverage
+  cache:
+    key: "${CI_COMMIT_REF_SLUG}-gcc10-cov"
+    paths:
+      - build/gcc10-cov
+    untracked: true
diff --git a/.gitlab-ci/gcc8-seq-coverage.yml b/.gitlab-ci/gcc8-seq-coverage.yml
deleted file mode 100644
index b1dde28e100add4c0aecccc07b7cb7c695cde92e..0000000000000000000000000000000000000000
--- a/.gitlab-ci/gcc8-seq-coverage.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-build:gcc8-seq-coverage:
-  image: localhost:5000/ubuntu_gcc8
-  stage: coverage
-  script:
-    - mkdir -p build/gcc8-seq-covrage
-    - cd build/gcc8-seq-covrage
-    - CXX=g++-8 CC=gcc-8 cmake ../.. -DCMAKE_BUILD_TYPE=Coverage
-    - make coverage
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-gcc8-seq-coverage"
-    paths:
-      - build/gcc8-seq-covrage
-    untracked: true
diff --git a/.gitlab-ci/gcc8-seq-dbg.yml b/.gitlab-ci/gcc8-seq-dbg.yml
deleted file mode 100644
index 4df967b28c0cb1137efd1762368149cccb360767..0000000000000000000000000000000000000000
--- a/.gitlab-ci/gcc8-seq-dbg.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-build:gcc8-seq-dbg:
-  image: localhost:5000/ubuntu_gcc8
-  stage: build
-  needs: []
-  script:
-    - mkdir -p build/gcc8-seq-dbg
-    - cd build/gcc8-seq-dbg
-    - CXX=g++-8 CC=gcc-8 cmake ../.. -DCMAKE_BUILD_TYPE=Debug
-    - make pugs
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-gcc8-seq-dbg"
-    paths:
-      - build/gcc8-seq-dbg
-    untracked: true
-
-test:gcc8-seq-dbg:
-  image: localhost:5000/ubuntu_gcc8
-  stage: test
-  needs: ["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"
-    paths:
-      - build/gcc8-seq-dbg
-    untracked: true
diff --git a/.gitlab-ci/gcc8-seq-release.yml b/.gitlab-ci/gcc8-seq-release.yml
deleted file mode 100644
index ada66bc8f920739da9e700af4475df0858f3b25c..0000000000000000000000000000000000000000
--- a/.gitlab-ci/gcc8-seq-release.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-build:gcc8-seq-release:
-  image: localhost:5000/ubuntu_gcc8
-  stage: build
-  needs: []
-  script:
-    - mkdir -p build/gcc8-seq-release
-    - cd build/gcc8-seq-release
-    - CXX=g++-8 CC=gcc-8 cmake ../.. -DCMAKE_BUILD_TYPE=Release
-    - make pugs
-  cache:
-    key: "${CI_COMMIT_REF_SLUG}-gcc8-seq-release"
-    paths:
-      - build/gcc8-seq-release
-    untracked: true
-
-test:gcc8-seq-release:
-  image: localhost:5000/ubuntu_gcc8
-  stage: test
-  needs: ["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"
-    paths:
-      - build/gcc8-seq-release
-    untracked: true