diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae96208da8541f44fc3d5cd468a07694cf2f003d..790b5133b3e073495207be0fcf365946ea67a7fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -683,30 +683,86 @@ clang_5.0_mpionly:
 clang_5.0_hybrid:
    <<: *build_hybrid_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+   only:
+      - triggers
    tags:
       - docker
 
 clang_5.0_serial_dbg:
    <<: *build_serial_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+   only:
+      - triggers
    tags:
       - docker
 
 clang_5.0_mpionly_dbg:
    <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+   only:
+      - triggers
    tags:
       - docker
 
 clang_5.0_hybrid_dbg:
    <<: *build_hybrid_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+   only:
+      - triggers
    tags:
       - docker
 
 clang_5.0_hybrid_dbg_sp:
    <<: *build_hybrid_dbg_sp_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+   only:
+      - triggers
+   tags:
+      - docker
+
+clang_6.0_serial:
+   <<: *build_serial_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   only:
+      - triggers
+   tags:
+      - docker
+
+clang_6.0_mpionly:
+   <<: *build_mpionly_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   only:
+      - triggers
+   tags:
+      - docker
+
+clang_6.0_hybrid:
+   <<: *build_hybrid_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   tags:
+      - docker
+
+clang_6.0_serial_dbg:
+   <<: *build_serial_dbg_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   tags:
+      - docker
+
+clang_6.0_mpionly_dbg:
+   <<: *build_mpionly_dbg_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   tags:
+      - docker
+
+clang_6.0_hybrid_dbg:
+   <<: *build_hybrid_dbg_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+   tags:
+      - docker
+
+clang_6.0_hybrid_dbg_sp:
+   <<: *build_hybrid_dbg_sp_definition
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
    tags:
       - docker