diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1daee1ae0df9c82887e63585128cae3f18376670..23804f1e94bfc28687cf7d08848f30187a9b2daa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -128,104 +128,6 @@ stages:
 
 
 
-intel_16_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
-
-intel_16_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
-
-intel_16_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
-
-intel_16_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
-
-intel_16_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
-
-intel_16_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
-      - intel
-
-intel_16_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
-
 intel_17_serial:
    <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
@@ -303,9 +205,9 @@ intel_17_hybrid_dbg:
       <<: *build_hybrid_dbg_variables
       WALBERLA_BUILD_WITH_CUDA: "OFF"
       WALBERLA_ENABLE_GUI: 0
-   only:
+   except:
       variables:
-         - $ENABLE_NIGHTLY_BUILDS
+         - $DISABLE_PER_COMMIT_BUILDS
    tags:
       - docker
       - intel
@@ -906,292 +808,6 @@ gcc_8_hybrid_dbg_sp:
    tags:
       - docker
 
-clang_3.6_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.6_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.6_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.6_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
-
-clang_3.7_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.7_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.7_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.7_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.8_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.8_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.8_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.8_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.8_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.8_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.8_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.9_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.9_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.9_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.9_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.9_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.9_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-clang_3.9_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_ENABLE_GUI: 0
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
 clang_4.0_serial:
    <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
@@ -1264,9 +880,9 @@ clang_4.0_hybrid_dbg:
       <<: *build_hybrid_dbg_variables
       WALBERLA_BUILD_WITH_CUDA: "OFF"
       WALBERLA_ENABLE_GUI: 0
-   only:
+   except:
       variables:
-         - $ENABLE_NIGHTLY_BUILDS
+         - $DISABLE_PER_COMMIT_BUILDS
    tags:
       - docker