diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4dc0ffe6292e737ea319162a0efd7106a1a32fb..0d49783980a9d002982245a780d1961073820786 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,7 +97,7 @@ stages:
 
 icc_2022_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_MPI: "OFF"
@@ -113,7 +113,7 @@ icc_2022_serial:
 
 icc_2022_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
@@ -127,7 +127,7 @@ icc_2022_mpionly:
 
 icc_2022_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WARNING_ERROR: "OFF"
@@ -137,7 +137,7 @@ icc_2022_hybrid:
 
 icc_2022_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_MPI: "OFF"
@@ -151,7 +151,7 @@ icc_2022_serial_dbg:
 
 icc_2022_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -163,7 +163,7 @@ icc_2022_mpionly_dbg:
 
 icc_2022_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -174,7 +174,7 @@ icc_2022_hybrid_dbg:
 
 icc_2022_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -186,9 +186,9 @@ icc_2022_hybrid_dbg_sp:
       - cuda11
       - docker
 
-icx_2022_serial:
+icx_2023_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_MPI: "OFF"
@@ -201,9 +201,9 @@ icx_2022_serial:
       - cuda11
       - docker
 
-icx_2022_mpionly:
+icx_2023_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
@@ -214,18 +214,18 @@ icx_2022_mpionly:
       - cuda11
       - docker
 
-icx_2022_hybrid:
+icx_2023_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
    tags:
       - cuda11
       - docker
 
-icx_2022_serial_dbg:
+icx_2023_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_MPI: "OFF"
@@ -236,9 +236,9 @@ icx_2022_serial_dbg:
       - cuda11
       - docker
 
-icx_2022_mpionly_dbg:
+icx_2023_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -247,9 +247,9 @@ icx_2022_mpionly_dbg:
       - cuda11
       - docker
 
-icx_2022_hybrid_dbg:
+icx_2023_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -257,9 +257,9 @@ icx_2022_hybrid_dbg:
       - cuda11
       - docker
 
-icx_2022_hybrid_dbg_sp:
+icx_2023_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -272,7 +272,7 @@ icx_2022_hybrid_dbg_sp:
 
 gcc_10_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -296,7 +296,7 @@ gcc_10_serial:
 
 gcc_10_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -318,7 +318,7 @@ gcc_10_mpionly:
 
 gcc_10_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -339,7 +339,7 @@ gcc_10_hybrid:
 
 gcc_10_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -364,7 +364,7 @@ gcc_10_serial_dbg:
 
 gcc_10_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -387,7 +387,7 @@ gcc_10_mpionly_dbg:
 
 gcc_10_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -406,7 +406,7 @@ gcc_10_hybrid_dbg:
 
 gcc_10_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -431,7 +431,7 @@ gcc_10_hybrid_dbg_sp:
 
 gcc_11_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -455,7 +455,7 @@ gcc_11_serial:
 
 gcc_11_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -477,7 +477,7 @@ gcc_11_mpionly:
 
 gcc_11_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -498,7 +498,7 @@ gcc_11_hybrid:
 
 gcc_11_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -523,7 +523,7 @@ gcc_11_serial_dbg:
 
 gcc_11_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -546,7 +546,7 @@ gcc_11_mpionly_dbg:
 
 gcc_11_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -568,7 +568,7 @@ gcc_11_hybrid_dbg:
 
 gcc_11_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -593,7 +593,7 @@ gcc_11_hybrid_dbg_sp:
 
 gcc_12_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -617,7 +617,7 @@ gcc_12_serial:
 
 gcc_12_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -639,7 +639,7 @@ gcc_12_mpionly:
 
 gcc_12_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -660,7 +660,7 @@ gcc_12_hybrid:
 
 gcc_12_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -685,7 +685,7 @@ gcc_12_serial_dbg:
 
 gcc_12_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -708,7 +708,7 @@ gcc_12_mpionly_dbg:
 
 gcc_12_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -730,7 +730,7 @@ gcc_12_hybrid_dbg:
 
 gcc_12_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -755,7 +755,7 @@ gcc_12_hybrid_dbg_sp:
 
 gcc_13_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -780,7 +780,7 @@ gcc_13_serial:
 
 gcc_13_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -803,7 +803,7 @@ gcc_13_mpionly:
 
 gcc_13_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:14
    stage: pretest
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
@@ -823,7 +823,7 @@ gcc_13_hybrid:
 
 gcc_13_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -846,7 +846,7 @@ gcc_13_serial_dbg:
 
 gcc_13_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -867,7 +867,7 @@ gcc_13_mpionly_dbg:
 
 gcc_13_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -887,7 +887,7 @@ gcc_13_hybrid_dbg:
 
 gcc_13_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -908,9 +908,9 @@ gcc_13_hybrid_dbg_sp:
       - cuda11
       - docker
 
-clang_13_serial:
+clang_14_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -932,9 +932,9 @@ clang_13_serial:
       - cuda11
       - docker
 
-clang_13_mpionly:
+clang_14_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -954,9 +954,9 @@ clang_13_mpionly:
       - cuda11
       - docker
 
-clang_13_hybrid:
+clang_14_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -975,9 +975,9 @@ clang_13_hybrid:
       - cuda11
       - docker
 
-clang_13_serial_dbg:
+clang_14_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1000,9 +1000,9 @@ clang_13_serial_dbg:
       - cuda11
       - docker
 
-clang_13_mpionly_dbg:
+clang_14_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1023,9 +1023,9 @@ clang_13_mpionly_dbg:
       - cuda11
       - docker
 
-clang_13_hybrid_dbg:
+clang_14_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1042,9 +1042,9 @@ clang_13_hybrid_dbg:
       - cuda11
       - docker
 
-clang_13_hybrid_dbg_sp:
+clang_14_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1067,9 +1067,9 @@ clang_13_hybrid_dbg_sp:
       - cuda11
       - docker
 
-clang_14_serial:
+clang_15_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1091,9 +1091,9 @@ clang_14_serial:
       - cuda11
       - docker
 
-clang_14_mpionly:
+clang_15_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1113,9 +1113,9 @@ clang_14_mpionly:
       - cuda11
       - docker
 
-clang_14_hybrid:
+clang_15_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1134,9 +1134,9 @@ clang_14_hybrid:
       - cuda11
       - docker
 
-clang_14_serial_dbg:
+clang_15_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1159,9 +1159,9 @@ clang_14_serial_dbg:
       - cuda11
       - docker
 
-clang_14_mpionly_dbg:
+clang_15_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1182,9 +1182,9 @@ clang_14_mpionly_dbg:
       - cuda11
       - docker
 
-clang_14_hybrid_dbg:
+clang_15_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1204,9 +1204,9 @@ clang_14_hybrid_dbg:
       - cuda11
       - docker
 
-clang_14_hybrid_dbg_sp:
+clang_15_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1229,9 +1229,9 @@ clang_14_hybrid_dbg_sp:
       - cuda11
       - docker
 
-clang_15_serial:
+clang_16_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1253,9 +1253,9 @@ clang_15_serial:
       - cuda11
       - docker
 
-clang_15_mpionly:
+clang_16_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1275,9 +1275,9 @@ clang_15_mpionly:
       - cuda11
       - docker
 
-clang_15_hybrid:
+clang_16_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1296,9 +1296,9 @@ clang_15_hybrid:
       - cuda11
       - docker
 
-clang_15_serial_dbg:
+clang_16_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1321,9 +1321,9 @@ clang_15_serial_dbg:
       - cuda11
       - docker
 
-clang_15_mpionly_dbg:
+clang_16_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1344,9 +1344,9 @@ clang_15_mpionly_dbg:
       - cuda11
       - docker
 
-clang_15_hybrid_dbg:
+clang_16_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1366,9 +1366,9 @@ clang_15_hybrid_dbg:
       - cuda11
       - docker
 
-clang_15_hybrid_dbg_sp:
+clang_16_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1391,9 +1391,9 @@ clang_15_hybrid_dbg_sp:
       - cuda11
       - docker
 
-clang_16_serial:
+clang_17_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1415,9 +1415,9 @@ clang_16_serial:
       - cuda11
       - docker
 
-clang_16_mpionly:
+clang_17_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1437,9 +1437,9 @@ clang_16_mpionly:
       - cuda11
       - docker
 
-clang_16_hybrid:
+clang_17_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1455,9 +1455,9 @@ clang_16_hybrid:
       - cuda11
       - docker
 
-clang_16_serial_dbg:
+clang_17_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1477,9 +1477,9 @@ clang_16_serial_dbg:
       - cuda11
       - docker
 
-clang_16_mpionly_dbg:
+clang_17_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1497,9 +1497,9 @@ clang_16_mpionly_dbg:
       - cuda11
       - docker
 
-clang_16_hybrid_dbg:
+clang_17_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1516,9 +1516,9 @@ clang_16_hybrid_dbg:
       - cuda11
       - docker
 
-clang_16_hybrid_dbg_sp:
+clang_17_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
    stage: pretest
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest