diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c80d39334350c3b7233db6c931cf305f2ee99be..5da3b93e96a3156389bdb1ab0ecc2c632b3fc9a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,8 @@ before_script: &before
   - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-fufem.git
   - duneci-install-module https://git.imp.fu-berlin.de/agnumpde/dune-elasticity.git
 
-# ADOLC's comparison operators return `int` instead of `bool` which confuses
-# template meta-programming in dune-common...
+# ADOL-C's comparison operators prior to version 2.7.2 return `int` instead of `bool`,
+# which confuses template meta-programming in dune-common...
 .patch-dune-common: &patch-dune-common
   - |-
     patch -d /duneci/modules/dune-common -p1 <<EOT
@@ -34,11 +34,12 @@ dune:2.6 gcc:
   variables:
     DUNECI_BRANCH: releases/2.6-1
 
-dune:2.6 clang:
-  image: registry.dune-project.org/docker/ci/dune:2.6-debian-10-clang-7-libcpp-17
+dune:2.7 gcc:
+  image: registry.dune-project.org/docker/ci/dune:2.7-debian-10-gcc-8-17
+  before_script:
+  - *patch-dune-common
+  - *before
   script: duneci-standard-test
-  variables:
-    DUNECI_BRANCH: releases/2.6-1
 
 dune:git gcc:
   image: registry.dune-project.org/docker/ci/dune:git-debian-10-gcc-8-17
@@ -48,7 +49,7 @@ dune:git gcc:
   script: duneci-standard-test
 
 dune:git clang:
-  image: registry.dune-project.org/docker/ci/dune:git-debian-10-clang-7-libcpp-17
+  image: registry.dune-project.org/docker/ci/dune:git-ubuntu-20.04-clang-10-20
   before_script:
   - *patch-dune-common
   - *before
@@ -63,7 +64,7 @@ dune:git parmg gcc:
   script: duneci-standard-test
 
 dune:git parmg clang:
-  image: registry.dune-project.org/docker/ci/dune:git-debian-10-clang-7-libcpp-17
+  image: registry.dune-project.org/docker/ci/dune:git-ubuntu-20.04-clang-10-20
   before_script:
   - *patch-dune-common
   - *before