diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 203b3ca1939e24b8f866d2fdee2d88b4f7f96b52..7fcdc8c5dfa6d3dd887ed8f4c6fcf4093e753869 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1121,9 +1121,9 @@ clang_7.0_hybrid:
       <<: *build_hybrid_variables
       WALBERLA_BUILD_WITH_CUDA: "OFF"
       WALBERLA_ENABLE_GUI: 0
-   except:
+   only:
       variables:
-         - $DISABLE_PER_COMMIT_BUILDS
+         - $ENABLE_NIGHTLY_BUILDS
    tags:
       - docker
 
@@ -1134,9 +1134,9 @@ clang_7.0_serial_dbg:
       <<: *build_serial_dbg_variables
       WALBERLA_BUILD_WITH_CUDA: "OFF"
       WALBERLA_ENABLE_GUI: 0
-   except:
+   only:
       variables:
-         - $DISABLE_PER_COMMIT_BUILDS
+         - $ENABLE_NIGHTLY_BUILDS
    tags:
       - docker
 
@@ -1147,9 +1147,9 @@ clang_7.0_mpionly_dbg:
       <<: *build_mpionly_dbg_variables
       WALBERLA_BUILD_WITH_CUDA: "OFF"
       WALBERLA_ENABLE_GUI: 0
-   except:
+   only:
       variables:
-         - $DISABLE_PER_COMMIT_BUILDS
+         - $ENABLE_NIGHTLY_BUILDS
    tags:
       - docker
 
@@ -1160,15 +1160,106 @@ clang_7.0_hybrid_dbg:
       <<: *build_hybrid_dbg_variables
       WALBERLA_BUILD_WITH_CUDA: "OFF"
       WALBERLA_ENABLE_GUI: 0
-   except:
+   only:
       variables:
-         - $DISABLE_PER_COMMIT_BUILDS
+         - $ENABLE_NIGHTLY_BUILDS
    tags:
       - docker
 
 clang_7.0_hybrid_dbg_sp:
    <<: *build_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+   variables:
+      <<: *build_hybrid_dbg_sp_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      WALBERLA_ENABLE_GUI: 0
+   only:
+      variables:
+         - $ENABLE_NIGHTLY_BUILDS
+   tags:
+      - docker
+
+clang_8.0_serial:
+   <<: *build_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+   variables:
+      <<: *build_serial_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      WALBERLA_ENABLE_GUI: 0
+   only:
+      variables:
+         - $ENABLE_NIGHTLY_BUILDS
+   tags:
+      - docker
+
+clang_8.0_mpionly:
+   <<: *build_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+   variables:
+      <<: *build_mpionly_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      WALBERLA_ENABLE_GUI: 0
+   only:
+      variables:
+         - $ENABLE_NIGHTLY_BUILDS
+   tags:
+      - docker
+
+clang_8.0_hybrid:
+   <<: *build_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+   variables:
+      <<: *build_hybrid_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      WALBERLA_ENABLE_GUI: 0
+   except:
+      variables:
+         - $DISABLE_PER_COMMIT_BUILDS
+   tags:
+      - docker
+
+clang_8.0_serial_dbg:
+   <<: *build_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+   variables:
+      <<: *build_serial_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      WALBERLA_ENABLE_GUI: 0
+   except:
+      variables:
+         - $DISABLE_PER_COMMIT_BUILDS
+   tags:
+      - docker
+
+clang_8.0_mpionly_dbg:
+   <<: *build_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+   variables:
+      <<: *build_mpionly_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      WALBERLA_ENABLE_GUI: 0
+   except:
+      variables:
+         - $DISABLE_PER_COMMIT_BUILDS
+   tags:
+      - docker
+
+clang_8.0_hybrid_dbg:
+   <<: *build_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+   variables:
+      <<: *build_hybrid_dbg_variables
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      WALBERLA_ENABLE_GUI: 0
+   except:
+      variables:
+         - $DISABLE_PER_COMMIT_BUILDS
+   tags:
+      - docker
+
+clang_8.0_hybrid_dbg_sp:
+   <<: *build_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
    stage: pretest
    variables:
       <<: *build_hybrid_dbg_sp_variables
@@ -1320,7 +1411,7 @@ msvc-14.1_Hybrid_Dbg:
    except:
       variables:
          - $DISABLE_PER_COMMIT_BUILDS
-
+      
 msvc-14.1_Hybrid_SP_Dbg:
    <<: *win_build_definition
    variables:
@@ -1333,7 +1424,7 @@ msvc-14.1_Hybrid_SP_Dbg:
    except:
       variables:
          - $DISABLE_PER_COMMIT_BUILDS
-
+      
 msvc-14.1_Hybrid:
    <<: *win_build_definition
    variables:
@@ -1346,7 +1437,7 @@ msvc-14.1_Hybrid:
    except:
       variables:
          - $DISABLE_PER_COMMIT_BUILDS
-
+      
 msvc-14.1_Serial_Dbg:
    <<: *win_build_definition
    variables:
@@ -1359,7 +1450,7 @@ msvc-14.1_Serial_Dbg:
    except:
       variables:
          - $DISABLE_PER_COMMIT_BUILDS
-
+      
 msvc-14.1_Serial:
    <<: *win_build_definition
    variables:
@@ -1372,7 +1463,7 @@ msvc-14.1_Serial:
    only:
       variables:
          - $ENABLE_NIGHTLY_BUILDS
-
+      
 msvc-14.1_MpiOnly_Dbg:
    <<: *win_build_definition
    variables:
@@ -1385,7 +1476,7 @@ msvc-14.1_MpiOnly_Dbg:
    except:
       variables:
          - $DISABLE_PER_COMMIT_BUILDS
-
+      
 msvc-14.1_MpiOnly:
    <<: *win_build_definition
    variables: