diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaf0b3baa11894ed7e8e1f0a16cddd4bdd6a5b70..3e9a1865382956bfaaa8bd8a1da80eadf05d38f1 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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022:21
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -188,7 +188,7 @@ icc_2022_hybrid_dbg_sp:
 
 icx_2023_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_MPI: "OFF"
@@ -203,7 +203,7 @@ icx_2023_serial:
 
 icx_2023_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
@@ -216,7 +216,7 @@ icx_2023_mpionly:
 
 icx_2023_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
    tags:
@@ -225,7 +225,7 @@ icx_2023_hybrid:
 
 icx_2023_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_MPI: "OFF"
@@ -238,7 +238,7 @@ icx_2023_serial_dbg:
 
 icx_2023_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -249,7 +249,7 @@ icx_2023_mpionly_dbg:
 
 icx_2023_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -259,7 +259,7 @@ icx_2023_hybrid_dbg:
 
 icx_2023_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2023:21
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -272,7 +272,7 @@ icx_2023_hybrid_dbg_sp:
 
 gcc_10_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-10:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-11:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-12:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21
    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:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -910,7 +910,7 @@ gcc_13_hybrid_dbg_sp:
 
 clang_14_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -934,7 +934,7 @@ clang_14_serial:
 
 clang_14_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -956,7 +956,7 @@ clang_14_mpionly:
 
 clang_14_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -977,7 +977,7 @@ clang_14_hybrid:
 
 clang_14_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1002,7 +1002,7 @@ clang_14_serial_dbg:
 
 clang_14_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1025,7 +1025,7 @@ clang_14_mpionly_dbg:
 
 clang_14_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1044,7 +1044,7 @@ clang_14_hybrid_dbg:
 
 clang_14_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1069,7 +1069,7 @@ clang_14_hybrid_dbg_sp:
 
 clang_15_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1093,7 +1093,7 @@ clang_15_serial:
 
 clang_15_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1115,7 +1115,7 @@ clang_15_mpionly:
 
 clang_15_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1136,7 +1136,7 @@ clang_15_hybrid:
 
 clang_15_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1161,7 +1161,7 @@ clang_15_serial_dbg:
 
 clang_15_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1184,7 +1184,7 @@ clang_15_mpionly_dbg:
 
 clang_15_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1206,7 +1206,7 @@ clang_15_hybrid_dbg:
 
 clang_15_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1231,7 +1231,7 @@ clang_15_hybrid_dbg_sp:
 
 clang_16_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1255,7 +1255,7 @@ clang_16_serial:
 
 clang_16_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1277,7 +1277,7 @@ clang_16_mpionly:
 
 clang_16_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1298,7 +1298,7 @@ clang_16_hybrid:
 
 clang_16_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1323,7 +1323,7 @@ clang_16_serial_dbg:
 
 clang_16_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1346,7 +1346,7 @@ clang_16_mpionly_dbg:
 
 clang_16_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1368,7 +1368,7 @@ clang_16_hybrid_dbg:
 
 clang_16_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-16:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1393,7 +1393,7 @@ clang_16_hybrid_dbg_sp:
 
 clang_17_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1417,7 +1417,7 @@ clang_17_serial:
 
 clang_17_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1439,7 +1439,7 @@ clang_17_mpionly:
 
 clang_17_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1457,7 +1457,7 @@ clang_17_hybrid:
 
 clang_17_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1479,7 +1479,7 @@ clang_17_serial_dbg:
 
 clang_17_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1499,7 +1499,7 @@ clang_17_mpionly_dbg:
 
 clang_17_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
       - cd python
@@ -1518,7 +1518,7 @@ clang_17_hybrid_dbg:
 
 clang_17_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:14
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17:21
    stage: pretest
    before_script:
       - pip3 install lbmpy==1.3.3 jinja2 pytest
@@ -1539,6 +1539,153 @@ clang_17_hybrid_dbg_sp:
       - cuda11
       - docker
 
+aocc_4_serial:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21
+   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
+   tags:
+      - cuda11
+      - docker
+
+aocc_4_mpionly:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21
+   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
+   tags:
+      - cuda11
+      - docker
+
+aocc_4_hybrid:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21
+   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
+
+aocc_4_serial_dbg:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21
+   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
+
+aocc_4_mpionly_dbg:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21
+   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
+
+aocc_4_hybrid_dbg:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21
+   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
+
+aocc_4_hybrid_dbg_sp:
+   extends: .build_template
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/aocc-4:21
+   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
+
 
 ###############################################################################
 ##                                                                           ##
@@ -1607,7 +1754,7 @@ cppcheck:
 
 
 coverage:
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
    script:
       - pip3 install gcovr
       - export NUM_CORES=$(nproc --all)
@@ -1833,15 +1980,15 @@ conda-py36-linux:
 
 benchmark_intel19:
    <<: *benchmark_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel-2022
 
 benchmark_gcc8:
    <<: *benchmark_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-13
 
 benchmark_clang8:
    <<: *benchmark_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:8.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17
 
 benchmark_ClangBuildAnalyzer:
   script:
@@ -1870,7 +2017,7 @@ benchmark_ClangBuildAnalyzer:
     - ninja all
     - ClangBuildAnalyzer --stop . CBA
     - ClangBuildAnalyzer --analyze CBA
-  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:9.0
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-17
   tags:
     - docker-benchmark
   only: