diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f42e0acf47756f9ea63cff8c45deb5299417740f..1300bafaa07d70e90e4bacb903aa8c0a600acb67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,46 +4,50 @@ variables:
 
 before_script:
   - . /duneci/bin/duneci-init-job
-  - duneci-install-module https://gitlab.dune-project.org/extensions/dune-alugrid.git
-  - duneci-install-module https://gitlab.dune-project.org/extensions/dune-foamgrid.git
-  - duneci-install-module https://gitlab.dune-project.org/extensions/dune-spgrid.git
-  - duneci-install-module https://gitlab.dune-project.org/extensions/dune-vtk.git
 
-.job_template: &job_configuration
+dune-git-istl-clang (with dune-alugrid):
   script:
     - duneci-standard-test
-    - dunecontrol --current make -j2 examples
-
-dune-git-clang:
-  <<: *job_configuration
   image: registry.dune-project.org/docker/ci/dune:git-debian-11-clang-13-20
+  before_script:
+    - duneci-install-module https://gitlab.dune-project.org/extensions/dune-foamgrid.git
 
-dune-git-istl-gcc:
-  <<: *job_configuration
+dune-git-istl-gcc (with examples):
   image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20
   variables:
     DUNECI_CMAKE_FLAGS: "-DBACKEND=ISTL"
     DUNECI_CXXFLAGS: "-Wno-deprecated-declarations -Wno-cpp"
+  script:
+    - duneci-standard-test
+    - dunecontrol --current make -j2 examples
 
-dune-git-petsc-gcc:
-  <<: *job_configuration
+dune-git-petsc-gcc (with dune-alugrid):
   image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20
   variables:
     DUNECI_CMAKE_FLAGS: "-DBACKEND=PETSC"
     DUNECI_CXXFLAGS: "-Wno-deprecated-declarations -Wno-cpp"
+  before_script:
+    - duneci-install-module https://gitlab.dune-project.org/extensions/dune-alugrid.git
+  script:
+    - duneci-standard-test
 
-dune-git-eigen-gcc:
-  <<: *job_configuration
+dune-git-eigen-gcc (with dune-spgrid):
   image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20
   variables:
     DUNECI_CMAKE_FLAGS: "-DBACKEND=EIGEN"
     DUNECI_CXXFLAGS: "-Wno-deprecated-declarations -Wno-cpp"
+  before_script:
+    - duneci-install-module https://gitlab.dune-project.org/extensions/dune-spgrid.git
+  script:
+    - duneci-standard-test
 
-dune-git-mtl-gcc:
-  <<: *job_configuration
+dune-git-mtl-gcc (with dune-vtk):
   image: registry.dune-project.org/docker/ci/dune:git-debian-11-gcc-10-20
   variables:
     DUNECI_CMAKE_FLAGS: "-DBACKEND=MTL -DMTL_INCLUDE_DIR=/duneci/libs/mtl4"
     DUNECI_CXXFLAGS: "-Wno-deprecated-declarations -Wno-cpp"
   before_script:
-  - git clone https://gitlab.mn.tu-dresden.de/spraetor/mtl4.git /duneci/libs/mtl4
+    - duneci-install-module https://gitlab.dune-project.org/extensions/dune-vtk.git
+    - git clone https://gitlab.mn.tu-dresden.de/spraetor/mtl4.git /duneci/libs/mtl4
+  script:
+    - duneci-standard-test