diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6869953d9b4f0c01279b33418093dffca06528bc..d13db5a2811cd3d2ba55466749ee3a9eb2a5ff40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,10 +5,10 @@ before_script:
   - duneci-install-module https://gitlab.dune-project.org/extensions/dune-subgrid.git
   - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-matrix-vector.git
 
-dune:2.8 debian-10 gcc-8 C++17:
+dune:2.8 debian-11 gcc-10 C++20:
   variables:
     DUNECI_BRANCH: releases/2.8
-  image: registry.dune-project.org/docker/ci/dune:2.8-debian-10-gcc-8-17
+  image: registry.dune-project.org/docker/ci/dune:2.8-debian-11-gcc-10-20
   before_script:
   script: duneci-standard-test
 
@@ -19,8 +19,12 @@ dune:2.9 debian-11 gcc-10 C++20:
   before_script:
   script: duneci-standard-test
 
-dune:git debian-10 clang  C++17:
-  image: registry.dune-project.org/docker/ci/dune:git-debian-10-clang-7-libcpp-17
+# dune:git debian-10 clang-7  C++17:
+#   image: registry.dune-project.org/docker/ci/dune:git-debian-10-clang-7-libcpp-17
+#   script: duneci-standard-test
+
+dune:git ubuntu-20-04 clang-10  C++20:
+  image: registry.dune-project.org/docker/ci/dune:git-ubuntu-20.04-clang-10-20
   script: duneci-standard-test
 
 dune:git debian-11 gcc-10  C++20: