diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5c7bc78b1c2d5c68b3811cd9b7ed1751eb2eedcc..f7be0b34502f06b552b0d7d36fdf1aabf115a35a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1788,6 +1788,10 @@ clang_10.0_hybrid:
    variables:
       WALBERLA_BUILD_WITH_CUDA: "OFF"
       WALBERLA_BUILD_WITH_CODEGEN: "ON"
+   only:
+      variables:
+         - $ENABLE_NIGHTLY_BUILDS
+   
    stage: merge_request
    when: manual
    needs: []
@@ -1811,6 +1815,10 @@ clang_10.0_serial_dbg:
       WALBERLA_BUILD_WITH_PARMETIS: "OFF"
       CMAKE_BUILD_TYPE: "DebugOptimized"
       WALBERLA_BUILD_WITH_CODEGEN: "ON"
+   only:
+      variables:
+         - $ENABLE_NIGHTLY_BUILDS
+   
    stage: merge_request
    when: manual
    needs: []
@@ -1832,6 +1840,14 @@ clang_10.0_mpionly_dbg:
       CMAKE_BUILD_TYPE: "DebugOptimized"
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
       WALBERLA_BUILD_WITH_CODEGEN: "ON"
+   only:
+      variables:
+         - $ENABLE_NIGHTLY_BUILDS
+   
+   stage: merge_request
+   when: manual
+   needs: []
+   allow_failure: false
    tags:
       - docker
 
@@ -1848,6 +1864,10 @@ clang_10.0_hybrid_dbg:
       WALBERLA_BUILD_WITH_CUDA: "OFF"
       CMAKE_BUILD_TYPE: "DebugOptimized"
       WALBERLA_BUILD_WITH_CODEGEN: "ON"
+   only:
+      variables:
+         - $ENABLE_NIGHTLY_BUILDS
+   
    stage: merge_request
    when: manual
    needs: []
@@ -1858,6 +1878,155 @@ clang_10.0_hybrid_dbg:
 clang_10.0_hybrid_dbg_sp:
    extends: .build_template
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:10.0
+   variables:
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      CMAKE_BUILD_TYPE: "DebugOptimized"
+      WALBERLA_DOUBLE_ACCURACY: "OFF"
+      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+      WALBERLA_BUILD_WITH_METIS: "OFF"
+   only:
+      variables:
+         - $ENABLE_NIGHTLY_BUILDS
+   
+   stage: merge_request
+   when: manual
+   needs: []
+   allow_failure: false
+   tags:
+      - docker
+
+clang_11.0_serial:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   before_script:
+      - pip3 install lbmpy jinja2
+      - cd python
+      - python3 -m unittest discover pystencils_walberla/
+      - python3 -m unittest discover lbmpy_walberla/
+      - cd ..
+   variables:
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      WALBERLA_BUILD_WITH_MPI: "OFF"
+      WALBERLA_BUILD_WITH_OPENMP: "OFF"
+      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+   only:
+      variables:
+         - $ENABLE_NIGHTLY_BUILDS
+   
+   stage: merge_request
+   when: manual
+   needs: []
+   allow_failure: false
+   tags:
+      - docker
+
+clang_11.0_mpionly:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   before_script:
+      - pip3 install lbmpy jinja2
+      - cd python
+      - python3 -m unittest discover pystencils_walberla/
+      - python3 -m unittest discover lbmpy_walberla/
+      - cd ..
+   variables:
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      WALBERLA_BUILD_WITH_OPENMP: "OFF"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+   only:
+      variables:
+         - $ENABLE_NIGHTLY_BUILDS
+   
+   stage: merge_request
+   when: manual
+   needs: []
+   allow_failure: false
+   tags:
+      - docker
+
+clang_11.0_hybrid:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   before_script:
+      - pip3 install lbmpy jinja2
+      - cd python
+      - python3 -m unittest discover pystencils_walberla/
+      - python3 -m unittest discover lbmpy_walberla/
+      - cd ..
+   variables:
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+   stage: merge_request
+   when: manual
+   needs: []
+   allow_failure: false
+   tags:
+      - docker
+
+clang_11.0_serial_dbg:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   before_script:
+      - pip3 install lbmpy jinja2
+      - cd python
+      - python3 -m unittest discover pystencils_walberla/
+      - python3 -m unittest discover lbmpy_walberla/
+      - cd ..
+   variables:
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      WALBERLA_BUILD_WITH_MPI: "OFF"
+      WALBERLA_BUILD_WITH_OPENMP: "OFF"
+      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+      CMAKE_BUILD_TYPE: "DebugOptimized"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+   stage: merge_request
+   when: manual
+   needs: []
+   allow_failure: false
+   tags:
+      - docker
+
+clang_11.0_mpionly_dbg:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   before_script:
+      - pip3 install lbmpy jinja2
+      - cd python
+      - python3 -m unittest discover pystencils_walberla/
+      - python3 -m unittest discover lbmpy_walberla/
+      - cd ..
+   variables:
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      CMAKE_BUILD_TYPE: "DebugOptimized"
+      WALBERLA_BUILD_WITH_OPENMP: "OFF"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+   tags:
+      - docker
+
+clang_11.0_hybrid_dbg:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   before_script:
+      - pip3 install lbmpy jinja2
+      - cd python
+      - python3 -m unittest discover pystencils_walberla/
+      - python3 -m unittest discover lbmpy_walberla/
+      - cd ..
+   variables:
+      WALBERLA_BUILD_WITH_CUDA: "OFF"
+      CMAKE_BUILD_TYPE: "DebugOptimized"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+   stage: merge_request
+   when: manual
+   needs: []
+   allow_failure: false
+   tags:
+      - docker
+
+clang_11.0_hybrid_dbg_sp:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
    stage: pretest
    variables:
       WALBERLA_BUILD_WITH_CUDA: "OFF"