diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d91ef097d5713229c8e6da0d2184d91f80d06c0a..bb7213c7456ec1cbb9aa5a7a35c949c620162b85 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,10 +5,14 @@ before_script:
   - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-fufem.git
   - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-solvers.git
 
-dune:git--clang:
-  image: duneci/dune:git
-  script: duneci-standard-test --opts=/duneci/opts.clang
+dune:git  clang  C++17:
+  image: registry.dune-project.org/docker/ci/dune:git-debian-10-clang-6-libcpp-17
+  script: duneci-standard-test
+
+dune:git  gcc-8  C++17:
+  image: registry.dune-project.org/docker/ci/dune:git-debian-10-gcc-8-17
+  script: duneci-standard-test
 
-dune:git--gcc:
-  image: duneci/dune:git
+dune:git  gcc-6  C++14:
+  image: registry.dune-project.org/docker/ci/dune:git-debian-9-gcc-6-14
   script: duneci-standard-test