diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9422543f7b89c190ab78a03daa43dc227d626a8f..96fd33644e550645ba98947c072f03744a7b89f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -269,9 +269,9 @@ icx_2022_hybrid_dbg_sp:
       - cuda11
       - docker
 
-gcc_9_serial:
+gcc_10_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -293,9 +293,9 @@ gcc_9_serial:
       - cuda11
       - docker
 
-gcc_9_mpionly:
+gcc_10_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -315,9 +315,9 @@ gcc_9_mpionly:
       - cuda11
       - docker
 
-gcc_9_hybrid:
+gcc_10_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -336,9 +336,9 @@ gcc_9_hybrid:
       - cuda11
       - docker
 
-gcc_9_serial_dbg:
+gcc_10_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -361,9 +361,9 @@ gcc_9_serial_dbg:
       - cuda11
       - docker
 
-gcc_9_mpionly_dbg:
+gcc_10_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -384,9 +384,9 @@ gcc_9_mpionly_dbg:
       - cuda11
       - docker
 
-gcc_9_hybrid_dbg:
+gcc_10_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -403,9 +403,9 @@ gcc_9_hybrid_dbg:
       - cuda11
       - docker
 
-gcc_9_hybrid_dbg_sp:
+gcc_10_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -428,9 +428,9 @@ gcc_9_hybrid_dbg_sp:
       - cuda11
       - docker
 
-gcc_10_serial:
+gcc_11_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -452,9 +452,9 @@ gcc_10_serial:
       - cuda11
       - docker
 
-gcc_10_mpionly:
+gcc_11_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -474,9 +474,9 @@ gcc_10_mpionly:
       - cuda11
       - docker
 
-gcc_10_hybrid:
+gcc_11_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -495,9 +495,9 @@ gcc_10_hybrid:
       - cuda11
       - docker
 
-gcc_10_serial_dbg:
+gcc_11_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -520,9 +520,9 @@ gcc_10_serial_dbg:
       - cuda11
       - docker
 
-gcc_10_mpionly_dbg:
+gcc_11_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -543,9 +543,9 @@ gcc_10_mpionly_dbg:
       - cuda11
       - docker
 
-gcc_10_hybrid_dbg:
+gcc_11_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -565,9 +565,9 @@ gcc_10_hybrid_dbg:
       - cuda11
       - docker
 
-gcc_10_hybrid_dbg_sp:
+gcc_11_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-11
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -590,9 +590,9 @@ gcc_10_hybrid_dbg_sp:
       - cuda11
       - docker
 
-gcc_11_serial:
+gcc_12_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -614,9 +614,9 @@ gcc_11_serial:
       - cuda11
       - docker
 
-gcc_11_mpionly:
+gcc_12_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -636,9 +636,9 @@ gcc_11_mpionly:
       - cuda11
       - docker
 
-gcc_11_hybrid:
+gcc_12_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -657,9 +657,9 @@ gcc_11_hybrid:
       - cuda11
       - docker
 
-gcc_11_serial_dbg:
+gcc_12_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -682,9 +682,9 @@ gcc_11_serial_dbg:
       - cuda11
       - docker
 
-gcc_11_mpionly_dbg:
+gcc_12_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -705,9 +705,9 @@ gcc_11_mpionly_dbg:
       - cuda11
       - docker
 
-gcc_11_hybrid_dbg:
+gcc_12_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -727,9 +727,9 @@ gcc_11_hybrid_dbg:
       - cuda11
       - docker
 
-gcc_11_hybrid_dbg_sp:
+gcc_12_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-12
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -752,14 +752,23 @@ gcc_11_hybrid_dbg_sp:
       - cuda11
       - docker
 
-gcc_12_serial:
+gcc_13_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
+   before_script:
+      - pip3 install lbmpy==1.3.3 jinja2 pytest
+      - cd python
+      - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
+      - pip3 list
+      - cd ..
+      - CC=gcc CXX=g++ pip3 install cupy-cuda11x
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_MPI: "OFF"
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
       WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+      WALBERLA_BUILD_WITH_PYTHON: "ON"
    only:
       variables:
          - $ENABLE_NIGHTLY_BUILDS
@@ -767,12 +776,21 @@ gcc_12_serial:
       - cuda11
       - docker
 
-gcc_12_mpionly:
+gcc_13_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
+   before_script:
+      - pip3 install lbmpy==1.3.3 jinja2 pytest
+      - cd python
+      - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
+      - pip3 list
+      - cd ..
+      - CC=gcc CXX=g++ pip3 install cupy-cuda11x
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+      WALBERLA_BUILD_WITH_PYTHON: "ON"
    only:
       variables:
          - $ENABLE_NIGHTLY_BUILDS
@@ -780,66 +798,111 @@ gcc_12_mpionly:
       - cuda11
       - docker
 
-gcc_12_hybrid:
+gcc_13_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
    stage: pretest
+   before_script:
+      - pip3 install lbmpy==1.3.3 jinja2 pytest
+      - cd python
+      - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
+      - pip3 list
+      - cd ..
+      - CC=gcc CXX=g++ pip3 install cupy-cuda11x
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+      WALBERLA_BUILD_WITH_PYTHON: "ON"
    tags:
       - cuda11
       - docker
 
-gcc_12_serial_dbg:
+gcc_13_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
+   before_script:
+      - pip3 install lbmpy==1.3.3 jinja2 pytest
+      - cd python
+      - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
+      - pip3 list
+      - cd ..
+      - CC=gcc CXX=g++ pip3 install cupy-cuda11x
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_MPI: "OFF"
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
       WALBERLA_BUILD_WITH_PARMETIS: "OFF"
       CMAKE_BUILD_TYPE: "DebugOptimized"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+      WALBERLA_BUILD_WITH_PYTHON: "ON"
    tags:
       - cuda11
       - docker
 
-gcc_12_mpionly_dbg:
+gcc_13_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
+   before_script:
+      - pip3 install lbmpy==1.3.3 jinja2 pytest
+      - cd python
+      - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
+      - pip3 list
+      - cd ..
+      - CC=gcc CXX=g++ pip3 install cupy-cuda11x
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+      WALBERLA_BUILD_WITH_PYTHON: "ON"
    tags:
       - cuda11
       - docker
 
-gcc_12_hybrid_dbg:
+gcc_13_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
+   before_script:
+      - pip3 install lbmpy==1.3.3 jinja2 pytest
+      - cd python
+      - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
+      - pip3 list
+      - cd ..
+      - CC=gcc CXX=g++ pip3 install cupy-cuda11x
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+      WALBERLA_BUILD_WITH_PYTHON: "ON"
    tags:
       - cuda11
       - docker
 
-gcc_12_hybrid_dbg_sp:
+gcc_13_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-13
+   before_script:
+      - pip3 install lbmpy==1.3.3 jinja2 pytest
+      - cd python
+      - python3 -m pytest --junitxml=report.xml pystencils_walberla lbmpy_walberla
+      - pip3 list
+      - cd ..
+      - CC=gcc CXX=g++ pip3 install cupy-cuda11x
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
       WALBERLA_DOUBLE_ACCURACY: "OFF"
       WALBERLA_BUILD_WITH_PARMETIS: "OFF"
       WALBERLA_BUILD_WITH_METIS: "OFF"
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+      WALBERLA_BUILD_WITH_PYTHON: "ON"
    tags:
       - cuda11
       - docker
 
-clang_12_serial:
+clang_13_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -861,9 +924,9 @@ clang_12_serial:
       - cuda11
       - docker
 
-clang_12_mpionly:
+clang_13_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -883,9 +946,9 @@ clang_12_mpionly:
       - cuda11
       - docker
 
-clang_12_hybrid:
+clang_13_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -904,9 +967,9 @@ clang_12_hybrid:
       - cuda11
       - docker
 
-clang_12_serial_dbg:
+clang_13_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -929,9 +992,9 @@ clang_12_serial_dbg:
       - cuda11
       - docker
 
-clang_12_mpionly_dbg:
+clang_13_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -952,9 +1015,9 @@ clang_12_mpionly_dbg:
       - cuda11
       - docker
 
-clang_12_hybrid_dbg:
+clang_13_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -971,9 +1034,9 @@ clang_12_hybrid_dbg:
       - cuda11
       - docker
 
-clang_12_hybrid_dbg_sp:
+clang_13_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -996,9 +1059,9 @@ clang_12_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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1020,9 +1083,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1042,9 +1105,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1063,9 +1126,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1088,9 +1151,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1111,9 +1174,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1133,9 +1196,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1158,9 +1221,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1182,9 +1245,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1204,9 +1267,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1225,9 +1288,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1250,9 +1313,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1273,9 +1336,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1295,9 +1358,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1320,9 +1383,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1344,9 +1407,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1366,9 +1429,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1384,9 +1447,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1406,9 +1469,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1426,9 +1489,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
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1445,9 +1508,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
    stage: pretest
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest