diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8986a85794249595412831b098f5625d4dc8c049..2c7c2a08ce4b2ac176e68d439e4b1ca2bd952c13 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,16 +6,16 @@ before_script:
 - echo "Running make concurrently with ${DUNECI_PARALLEL} cores, where possibly"
 - patches/apply_patches.sh
 
-git--gcc:
-  image: registry.dune-project.org/joe/dune-perftool-ci/perftool-base:git
+git-debian-10-gcc-7-14:
+  image: "registry.dune-project.org/docker/ci/dune-pdelab:git-debian-10-gcc-7-14"
   script: duneci-standard-test
   tags:
     - "cores:20"
     - "perftool"
 
-git--clang:
-  image: registry.dune-project.org/joe/dune-perftool-ci/perftool-base:git
-  script: duneci-standard-test --opts=/duneci/opts.clang
+git-debian-10-clang-6-libcpp-17:
+  image: "registry.dune-project.org/docker/ci/dune-pdelab:git-debian-10-clang-6-libcpp-17"
+  script: duneci-standard-test
   tags:
     - "cores:20"
     - "perftool"