diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f54d49c50652d300d3e7294bab27414d0dc158d..7289a764384704e21de936dd88d7068bdf230e5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ before_script:
   - duneci-install-module https://gitlab.dune-project.org/dune-fem/dune-fem.git
 
 debian-11-gcc-9-17:
-  image: duneci/debian:11
+  image: registry.dune-project.org/docker/ci/debian:11
   script:
     - source /duneci/modules/dune-pip/bin/activate
       # issue with setup-dunepy: dune-fem-dg not yet build so dependency in dune-fem-dg fails
@@ -32,16 +32,13 @@ debian-11-gcc-9-17:
     - duneci-standard-test
   variables:
     DUNECI_TOOLCHAIN:  gcc-9-17
-    # DUNE_LOG_FORMAT:   '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
-    # DUNE_LOG_LEVEL:    DEBUG
-    # MAKEFLAGS:         "--verbose --output-sync=target --print-directory"
 
-ubuntu:18.04--gcc:
-  image: duneci/ubuntu:18.04
-  script:
-    - source /duneci/modules/dune-pip/bin/activate
-      # issue with setup-dunepy: dune-fem-dg not yet build so dependency in dune-fem-dg fails
-      # - python /duneci/modules/dune-python/bin/setup-dunepy.py --opts=$CI_PROJECT_DIR/scripts/opts/ci-gcc.opts install
-    - duneci-standard-test
-  variables:
-    DUNECI_TOOLCHAIN:  gcc-7-17
+    #ubuntu:20.04--gcc:
+    #image: duneci/ubuntu:18.04
+    #script:
+    #- source /duneci/modules/dune-pip/bin/activate
+    #  # issue with setup-dunepy: dune-fem-dg not yet build so dependency in dune-fem-dg fails
+    #  # - python /duneci/modules/dune-python/bin/setup-dunepy.py --opts=$CI_PROJECT_DIR/scripts/opts/ci-gcc.opts install
+    #- duneci-standard-test
+    #variables:
+    #DUNECI_TOOLCHAIN:  gcc-7-17