diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1609a5207c3be081f5239a84e6a4d489e711e910..a2decd792acfad9c19a54bac15a22d62163515ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,14 @@
 ---
 # Install external dependencies
 
-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-7-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