diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7ef1913d978e175558c2c7a6b397f66c8f0ab40..7e2b7ed80151fdc14ee3cdf7f0ade56649324ece 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -118,47 +118,47 @@
 intel_15_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
+   only:
+      - triggers
    tags:
       - docker
       - intel
-   only:
-      - triggers
 
 intel_15_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
+   only:
+      - triggers
    tags:
       - docker
       - intel
-   only:
-      - triggers
 
 intel_15_hybrid:
    <<: *build_hybrid_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
+   only:
+      - triggers
    tags:
       - docker
       - intel
-   only:
-      - triggers
 
 intel_15_serial_dbg:
    <<: *build_serial_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
+   only:
+      - triggers
    tags:
       - docker
       - intel
-   only:
-      - triggers
 
 intel_15_mpionly_dbg:
    <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
+   only:
+      - triggers
    tags:
       - docker
       - intel
-   only:
-      - triggers
 
 intel_15_hybrid_dbg:
    <<: *build_hybrid_dbg_definition
@@ -170,99 +170,99 @@ intel_15_hybrid_dbg:
 intel_15_hybrid_dbg_sp:
    <<: *build_hybrid_dbg_sp_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:15
+   only:
+      - triggers
    tags:
       - docker
       - intel
-   only:
-      - triggers
 
 intel_16_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   only:
+      - triggers
    tags:
       - docker
       - intel
       - cuda
-   only:
-      - triggers
 
 intel_16_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   only:
+      - triggers
    tags:
       - docker
       - intel
       - cuda
-   only:
-      - triggers
 
 intel_16_hybrid:
    <<: *build_hybrid_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   only:
+      - triggers
    tags:
       - docker
       - intel
       - cuda
-   only:
-      - triggers
 
 intel_16_serial_dbg:
    <<: *build_serial_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   only:
+      - triggers
    tags:
       - docker
       - intel
       - cuda
-   only:
-      - triggers
 
 intel_16_mpionly_dbg:
    <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   only:
+      - triggers
    tags:
       - docker
       - intel
       - cuda
-   only:
-      - triggers
 
 intel_16_hybrid_dbg:
    <<: *build_hybrid_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   only:
+      - triggers
    tags:
       - docker
       - intel
       - cuda
-   only:
-      - triggers
 
 intel_16_hybrid_dbg_sp:
    <<: *build_hybrid_dbg_sp_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+   only:
+      - triggers
    tags:
       - docker
       - intel
       - cuda
-   only:
-      - triggers
 
 intel_17_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+   only:
+      - triggers
    tags:
       - docker
       - intel
-   only:
-      - triggers
 
 intel_17_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+   only:
+      - triggers
    tags:
       - docker
       - intel
-   only:
-      - triggers
 
 intel_17_hybrid:
    <<: *build_hybrid_definition
@@ -302,42 +302,42 @@ intel_17_hybrid_dbg_sp:
 gcc_4.7_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.7_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.7_hybrid:
    <<: *build_hybrid_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.7_serial_dbg:
    <<: *build_serial_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.7_mpionly_dbg:
    <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.7_hybrid_dbg:
    <<: *build_hybrid_dbg_definition
@@ -348,140 +348,140 @@ gcc_4.7_hybrid_dbg:
 gcc_4.7_hybrid_dbg_sp:
    <<: *build_hybrid_dbg_sp_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.7
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.8_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.8_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.8_hybrid:
    <<: *build_hybrid_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.8_serial_dbg:
    <<: *build_serial_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.8_mpionly_dbg:
    <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.8_hybrid_dbg:
    <<: *build_hybrid_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.8_hybrid_dbg_sp:
    <<: *build_hybrid_dbg_sp_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.8
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.9_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.9_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.9_hybrid:
    <<: *build_hybrid_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.9_serial_dbg:
    <<: *build_serial_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.9_mpionly_dbg:
    <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.9_hybrid_dbg:
    <<: *build_hybrid_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_4.9_hybrid_dbg_sp:
    <<: *build_hybrid_dbg_sp_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:4.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_5_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 gcc_5_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 gcc_5_hybrid:
    <<: *build_hybrid_definition
@@ -489,8 +489,6 @@ gcc_5_hybrid:
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 gcc_5_serial_dbg:
    <<: *build_serial_dbg_definition
@@ -502,24 +500,26 @@ gcc_5_serial_dbg:
 gcc_5_mpionly_dbg:
    <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 gcc_5_hybrid_dbg:
    <<: *build_hybrid_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 gcc_5_hybrid_dbg_sp:
    <<: *build_hybrid_dbg_sp_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+   only:
+      - triggers
    tags:
       - docker
       - cuda
@@ -527,18 +527,18 @@ gcc_5_hybrid_dbg_sp:
 gcc_6_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_6_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 gcc_6_hybrid:
    <<: *build_hybrid_definition
@@ -573,380 +573,277 @@ gcc_6_hybrid_dbg_sp:
 clang_3.4_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 clang_3.4_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
-   tags:
-      - docker
    only:
       - triggers
-
-clang_3.4_hybrid:
-   <<: *build_hybrid_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
    tags:
       - docker
-   only:
-      - triggers
 
 clang_3.4_serial_dbg:
    <<: *build_serial_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 clang_3.4_mpionly_dbg:
    <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
-   tags:
-      - docker
    only:
       - triggers
-
-clang_3.4_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
    tags:
       - docker
 
-clang_3.4_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.4
-   tags:
-      - docker
-   only:
-      - triggers
-
 clang_3.5_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.5_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
-   tags:
-      - docker
-      - cuda
    only:
       - triggers
-
-clang_3.5_hybrid:
-   <<: *build_hybrid_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.5_serial_dbg:
    <<: *build_serial_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.5_mpionly_dbg:
    <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
-   tags:
-      - docker
-      - cuda
    only:
       - triggers
-
-clang_3.5_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
    tags:
       - docker
       - cuda
-   only:
-      - triggers
-
-clang_3.5_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.5
-   tags:
-      - docker
-      - cuda
-   only:
-      - triggers
 
 clang_3.6_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.6_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
-   tags:
-      - docker
-      - cuda
    only:
       - triggers
-
-clang_3.6_hybrid:
-   <<: *build_hybrid_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.6_serial_dbg:
    <<: *build_serial_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
-   tags:
-      - docker
-      - cuda
    only:
       - triggers
-
-clang_3.6_mpionly_dbg:
-   <<: *build_mpionly_dbg_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
-clang_3.6_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
+clang_3.6_mpionly_dbg:
+   <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
-   tags:
-      - docker
-      - cuda
    only:
       - triggers
-
-clang_3.6_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.7_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.7_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
-   tags:
-      - docker
-      - cuda
    only:
       - triggers
-
-clang_3.7_hybrid:
-   <<: *build_hybrid_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.7_serial_dbg:
    <<: *build_serial_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.7_mpionly_dbg:
    <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
-   tags:
-      - docker
-      - cuda
    only:
       - triggers
-
-clang_3.7_hybrid_dbg:
-   <<: *build_hybrid_dbg_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
    tags:
       - docker
       - cuda
-   only:
-      - triggers
-
-clang_3.7_hybrid_dbg_sp:
-   <<: *build_hybrid_dbg_sp_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
-   tags:
-      - docker
-      - cuda
-   only:
-      - triggers
 
 clang_3.8_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.8_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.8_hybrid:
    <<: *build_hybrid_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.8_serial_dbg:
    <<: *build_serial_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.8_mpionly_dbg:
    <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.8_hybrid_dbg:
    <<: *build_hybrid_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.8_hybrid_dbg_sp:
    <<: *build_hybrid_dbg_sp_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+   only:
+      - triggers
    tags:
       - docker
       - cuda
-   only:
-      - triggers
 
 clang_3.9_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 clang_3.9_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 clang_3.9_hybrid:
    <<: *build_hybrid_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 clang_3.9_serial_dbg:
    <<: *build_serial_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 clang_3.9_mpionly_dbg:
    <<: *build_mpionly_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 clang_3.9_hybrid_dbg:
    <<: *build_hybrid_dbg_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 clang_3.9_hybrid_dbg_sp:
    <<: *build_hybrid_dbg_sp_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 clang_4.0_serial:
    <<: *build_serial_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 clang_4.0_mpionly:
    <<: *build_mpionly_definition
    image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
-   tags:
-      - docker
    only:
       - triggers
+   tags:
+      - docker
 
 clang_4.0_hybrid:
    <<: *build_hybrid_definition
@@ -1236,4 +1133,4 @@ msvc-14_MpiOnly:
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
       WALBERLA_DOUBLE_ACCURACY: "ON"
    only:
-      - triggers
+      - triggers
\ No newline at end of file