diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4f2f9f7503d784829c100bcbf16f09da9bb0e72..8b5e70c79d614ce2bdc9e5f4e096da7c0182feba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,14 +1,28 @@
 ---
-dune:2.6--gcc:
-  image: registry.dune-project.org/docker/ci/dune:2.6-debian-10-gcc-7-14
-  script:
-  - dunecontrol --current --opts=/duneci/toolchains/gcc-7-14 all
-  - cmake --build build-cmake --target build_tests
-  - cmake --build build-cmake --target test
-  
-dune:2.6--clang:
-  image:  registry.dune-project.org/docker/ci/dune:2.6-debian-10-clang-6-libcpp-17
-  script:
-  - dunecontrol --current --opts=/duneci/toolchains/clang-6-libcpp-17 all
-  - cmake --build build-cmake --target build_tests
-  - cmake --build build-cmake --target test
+debian:10 gcc-8-17:
+  image: registry.dune-project.org/docker/ci/dune:2.6-debian-10-gcc-8-17
+  script: duneci-standard-test
+  variables:
+    DUNECI_TOOLCHAIN: gcc-8-17
+  tags: [duneci]
+
+debian:10 clang-6-libcpp-17:
+  image: registry.dune-project.org/docker/ci/dune:2.6-debian-10-clang-6-libcpp-17
+  script: duneci-standard-test
+  variables:
+    DUNECI_TOOLCHAIN: clang-6-libcpp-17
+  tags: [duneci]
+
+debian:9 gcc-6-14:
+  image: registry.dune-project.org/docker/ci/dune:2.6-debian-9-gcc-6-14
+  script: duneci-standard-test
+  variables:
+    DUNECI_TOOLCHAIN: gcc-6-14
+  tags: [duneci]
+
+ubuntu:18.04 clang-6-17:
+  image: registry.dune-project.org/docker/ci/dune:2.6-ubuntu-18.04-clang-6-17
+  script: duneci-standard-test
+  variables:
+    DUNECI_TOOLCHAIN: clang-6-17
+  tags: [duneci]