diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00b4e8d8535b78fcb59e6f54a08e34c4516c4828..dcc80a139b87edb14a5418f5928b16804e256c91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ stages:
 
 .build_template:
    script:
-      - pip install -I cmake==3.16.3
+      - pip install -I cmake==3.16.3 jinja2
       - export NUM_CORES=$(nproc --all)
       - export MAX_BUILD_CORES=$(( $(awk '( $1 == "MemTotal:" ) { print $2 }' /proc/meminfo) / ( 4 * 1024 * 1024  ) ))
       - "[[ $MAX_BUILD_CORES -lt $NUM_CORES ]] && export NUM_BUILD_CORES=$MAX_BUILD_CORES || export NUM_BUILD_CORES=$NUM_CORES"
@@ -47,7 +47,7 @@ stages:
         -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP
         -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS
         -DWALBERLA_DOUBLE_ACCURACY=$WALBERLA_DOUBLE_ACCURACY
-        -DWARNING_ERROR=ON
+        -DWARNING_ERROR=$WARNING_ERROR
         -DWALBERLA_BUILD_WITH_METIS=$WALBERLA_BUILD_WITH_METIS
         -DWALBERLA_BUILD_WITH_PARMETIS=$WALBERLA_BUILD_WITH_PARMETIS
         -DWALBERLA_BUILD_WITH_FFTW=$WALBERLA_BUILD_WITH_FFTW
@@ -77,6 +77,7 @@ stages:
       WALBERLA_BUILD_WITH_FFTW: "ON"
       WALBERLA_ENABLE_GUI: "OFF"
       WALBERLA_LOGLEVEL: "DETAIL"
+      WARNING_ERROR: "ON"
    artifacts:
       when: always
       reports:
@@ -93,341 +94,105 @@ stages:
 
 
 
-intel_19_serial:
+icc_2022_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
-
-intel_19_mpionly:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
-
-intel_19_hybrid:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
-
-intel_19_serial_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   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"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
-
-intel_19_mpionly_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
-
-intel_19_hybrid_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-   tags:
-      - cuda
-      - docker
-      - intel
-
-intel_19_hybrid_dbg_sp:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_DOUBLE_ACCURACY: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
-
-intel_20_serial:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:20
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_MPI: "OFF"
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
       WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
-
-intel_20_mpionly:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:20
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+      WARNING_ERROR: "OFF"
    only:
       variables:
          - $ENABLE_NIGHTLY_BUILDS
    tags:
-      - cuda
-      - docker
-      - intel
-
-intel_20_hybrid:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:20
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-   tags:
-      - cuda
-      - docker
-      - intel
-
-intel_20_serial_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:20
-   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"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-   tags:
-      - cuda
-      - docker
-      - intel
-
-intel_20_mpionly_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:20
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-   tags:
-      - cuda
-      - docker
-      - intel
-
-intel_20_hybrid_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:20
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-   tags:
-      - cuda
-      - docker
-      - intel
-
-intel_20_hybrid_dbg_sp:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:20
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_DOUBLE_ACCURACY: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      CMAKE_CXX_FLAGS: "-qoverride-limits"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-   tags:
-      - cuda
-      - docker
-      - intel
-
-gcc_7_serial:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
+      - cuda11
       - docker
 
-gcc_7_mpionly:
+icc_2022_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
+      WARNING_ERROR: "OFF"
    only:
       variables:
          - $ENABLE_NIGHTLY_BUILDS
    tags:
-      - cuda
+      - cuda11
       - docker
 
-gcc_7_hybrid:
+icc_2022_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
+      WARNING_ERROR: "OFF"
    tags:
-      - cuda
+      - cuda11
       - docker
 
-gcc_7_serial_dbg:
+icc_2022_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
    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"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
+      WARNING_ERROR: "OFF"
    tags:
-      - cuda
+      - cuda11
       - docker
 
-gcc_7_mpionly_dbg:
+icc_2022_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
+      WARNING_ERROR: "OFF"
    tags:
-      - cuda
+      - cuda11
       - docker
 
-gcc_7_hybrid_dbg:
+icc_2022_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
+      WARNING_ERROR: "OFF"
    tags:
-      - cuda
+      - cuda11
       - docker
 
-gcc_7_hybrid_dbg_sp:
+icc_2022_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icc-2022
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
       WALBERLA_DOUBLE_ACCURACY: "OFF"
       WALBERLA_BUILD_WITH_PARMETIS: "OFF"
       WALBERLA_BUILD_WITH_METIS: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
+      WARNING_ERROR: "OFF"
    tags:
-      - cuda
+      - cuda11
       - docker
 
-gcc_8_serial:
+icx_2022_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
-   before_script:
-      - pip3 install lbmpy==1.3.2 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
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
    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
@@ -435,21 +200,12 @@ gcc_8_serial:
       - cuda11
       - docker
 
-gcc_8_mpionly:
+icx_2022_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
-   before_script:
-      - pip3 install lbmpy==1.3.2 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
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
    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
@@ -457,125 +213,65 @@ gcc_8_mpionly:
       - cuda11
       - docker
 
-gcc_8_hybrid:
+icx_2022_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
-   before_script:
-      - pip3 install lbmpy==1.3.2 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
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
-      WALBERLA_BUILD_WITH_CODEGEN: "ON"
-      WALBERLA_BUILD_WITH_PYTHON: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
    tags:
       - cuda11
       - docker
 
-gcc_8_serial_dbg:
+icx_2022_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
-   before_script:
-      - pip3 install lbmpy==1.3.2 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
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
    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"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
    tags:
       - cuda11
       - docker
 
-gcc_8_mpionly_dbg:
+icx_2022_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
-   before_script:
-      - pip3 install lbmpy==1.3.2 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
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
    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"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
    tags:
       - cuda11
       - docker
 
-gcc_8_hybrid_dbg:
+icx_2022_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
-   before_script:
-      - pip3 install lbmpy==1.3.2 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
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_BUILD_WITH_CODEGEN: "ON"
-      WALBERLA_BUILD_WITH_PYTHON: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
    tags:
       - cuda11
       - docker
 
-gcc_8_hybrid_dbg_sp:
+icx_2022_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:8
-   before_script:
-      - pip3 install lbmpy==1.3.2 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
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/icx-2022
    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"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
    tags:
       - cuda11
       - docker
 
 gcc_9_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -599,7 +295,7 @@ gcc_9_serial:
 
 gcc_9_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -621,7 +317,7 @@ gcc_9_mpionly:
 
 gcc_9_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -642,7 +338,7 @@ gcc_9_hybrid:
 
 gcc_9_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -667,7 +363,7 @@ gcc_9_serial_dbg:
 
 gcc_9_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -690,7 +386,7 @@ gcc_9_mpionly_dbg:
 
 gcc_9_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:9
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc-9
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -703,16 +399,13 @@ gcc_9_hybrid_dbg:
       CMAKE_BUILD_TYPE: "DebugOptimized"
       WALBERLA_BUILD_WITH_CODEGEN: "ON"
       WALBERLA_BUILD_WITH_PYTHON: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
    tags:
       - cuda11
       - docker
 
 gcc_9_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-9
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -737,7 +430,7 @@ gcc_9_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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -761,7 +454,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -783,7 +476,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -804,7 +497,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -829,7 +522,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -852,7 +545,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -874,7 +567,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -899,7 +592,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -923,7 +616,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -945,7 +638,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -966,7 +659,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -991,7 +684,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1014,7 +707,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1036,7 +729,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
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1061,7 +754,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
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_MPI: "OFF"
@@ -1076,7 +769,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
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_OPENMP: "OFF"
@@ -1089,7 +782,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
    stage: pretest
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
@@ -1099,7 +792,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
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       WALBERLA_BUILD_WITH_MPI: "OFF"
@@ -1112,7 +805,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
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -1123,7 +816,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
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -1133,7 +826,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
    variables:
       WALBERLA_BUILD_WITH_CUDA: "ON"
       CMAKE_BUILD_TYPE: "DebugOptimized"
@@ -1144,204 +837,168 @@ gcc_12_hybrid_dbg_sp:
       - cuda11
       - docker
 
-clang_9.0_serial:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:9.0
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-
-clang_9.0_mpionly:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:9.0
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-
-clang_9.0_hybrid:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:9.0
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-
-clang_9.0_serial_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:9.0
-   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"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-
-clang_9.0_mpionly_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:9.0
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-
-clang_9.0_hybrid_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:9.0
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-   tags:
-      - cuda
-      - docker
-
-clang_9.0_hybrid_dbg_sp:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:9.0
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_DOUBLE_ACCURACY: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-
-clang_10.0_serial:
+clang_12_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:10.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   before_script:
+      - pip3 install lbmpy==1.3.2 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:
-      - cuda
+      - cuda11
       - docker
 
-clang_10.0_mpionly:
+clang_12_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:10.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   before_script:
+      - pip3 install lbmpy==1.3.2 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:
-      - cuda
+      - cuda11
       - docker
 
-clang_10.0_hybrid:
+clang_12_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:10.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   before_script:
+      - pip3 install lbmpy==1.3.2 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"
    only:
       variables:
          - $ENABLE_NIGHTLY_BUILDS
    tags:
-      - cuda
+      - cuda11
       - docker
 
-clang_10.0_serial_dbg:
+clang_12_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:10.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   before_script:
+      - pip3 install lbmpy==1.3.2 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"
    only:
       variables:
          - $ENABLE_NIGHTLY_BUILDS
    tags:
-      - cuda
+      - cuda11
       - docker
 
-clang_10.0_mpionly_dbg:
+clang_12_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:10.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   before_script:
+      - pip3 install lbmpy==1.3.2 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"
    only:
       variables:
          - $ENABLE_NIGHTLY_BUILDS
    tags:
-      - cuda
+      - cuda11
       - docker
 
-clang_10.0_hybrid_dbg:
+clang_12_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:10.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   before_script:
+      - pip3 install lbmpy==1.3.2 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"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
+      WALBERLA_BUILD_WITH_CODEGEN: "ON"
+      WALBERLA_BUILD_WITH_PYTHON: "ON"
    tags:
-      - cuda
+      - cuda11
       - docker
 
-clang_10.0_hybrid_dbg_sp:
+clang_12_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:10.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-12
+   before_script:
+      - pip3 install lbmpy==1.3.2 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"
    only:
       variables:
          - $ENABLE_NIGHTLY_BUILDS
    tags:
-      - cuda
+      - cuda11
       - docker
 
-clang_11.0_serial:
+clang_13_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1363,9 +1020,9 @@ clang_11.0_serial:
       - cuda11
       - docker
 
-clang_11.0_mpionly:
+clang_13_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1385,9 +1042,9 @@ clang_11.0_mpionly:
       - cuda11
       - docker
 
-clang_11.0_hybrid:
+clang_13_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1406,9 +1063,9 @@ clang_11.0_hybrid:
       - cuda11
       - docker
 
-clang_11.0_serial_dbg:
+clang_13_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1431,9 +1088,9 @@ clang_11.0_serial_dbg:
       - cuda11
       - docker
 
-clang_11.0_mpionly_dbg:
+clang_13_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1454,9 +1111,9 @@ clang_11.0_mpionly_dbg:
       - cuda11
       - docker
 
-clang_11.0_hybrid_dbg:
+clang_13_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1476,9 +1133,9 @@ clang_11.0_hybrid_dbg:
       - cuda11
       - docker
 
-clang_11.0_hybrid_dbg_sp:
+clang_13_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-13
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1501,9 +1158,9 @@ clang_11.0_hybrid_dbg_sp:
       - cuda11
       - docker
 
-clang_12.0_serial:
+clang_14_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1525,9 +1182,9 @@ clang_12.0_serial:
       - cuda11
       - docker
 
-clang_12.0_mpionly:
+clang_14_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1547,9 +1204,9 @@ clang_12.0_mpionly:
       - cuda11
       - docker
 
-clang_12.0_hybrid:
+clang_14_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1568,9 +1225,9 @@ clang_12.0_hybrid:
       - cuda11
       - docker
 
-clang_12.0_serial_dbg:
+clang_14_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1593,9 +1250,9 @@ clang_12.0_serial_dbg:
       - cuda11
       - docker
 
-clang_12.0_mpionly_dbg:
+clang_14_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1616,9 +1273,9 @@ clang_12.0_mpionly_dbg:
       - cuda11
       - docker
 
-clang_12.0_hybrid_dbg:
+clang_14_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1638,9 +1295,9 @@ clang_12.0_hybrid_dbg:
       - cuda11
       - docker
 
-clang_12.0_hybrid_dbg_sp:
+clang_14_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:12.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-14
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1663,9 +1320,9 @@ clang_12.0_hybrid_dbg_sp:
       - cuda11
       - docker
 
-clang_13.0_serial:
+clang_15_serial:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1687,9 +1344,9 @@ clang_13.0_serial:
       - cuda11
       - docker
 
-clang_13.0_mpionly:
+clang_15_mpionly:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1709,9 +1366,9 @@ clang_13.0_mpionly:
       - cuda11
       - docker
 
-clang_13.0_hybrid:
+clang_15_hybrid:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1727,9 +1384,9 @@ clang_13.0_hybrid:
       - cuda11
       - docker
 
-clang_13.0_serial_dbg:
+clang_15_serial_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1749,9 +1406,9 @@ clang_13.0_serial_dbg:
       - cuda11
       - docker
 
-clang_13.0_mpionly_dbg:
+clang_15_mpionly_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1769,9 +1426,9 @@ clang_13.0_mpionly_dbg:
       - cuda11
       - docker
 
-clang_13.0_hybrid_dbg:
+clang_15_hybrid_dbg:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
       - cd python
@@ -1788,9 +1445,9 @@ clang_13.0_hybrid_dbg:
       - cuda11
       - docker
 
-clang_13.0_hybrid_dbg_sp:
+clang_15_hybrid_dbg_sp:
    extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:13.0
+   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
    stage: pretest
    before_script:
       - pip3 install lbmpy==1.3.2 jinja2 pytest
@@ -1811,83 +1468,6 @@ clang_13.0_hybrid_dbg_sp:
       - cuda11
       - docker
 
-inteloneapi_22.3_serial:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-inteloneapi_22.3_mpionly:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-
-inteloneapi_22.3_hybrid:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   tags:
-      - docker
-
-inteloneapi_22.3_serial_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-   tags:
-      - docker
-
-inteloneapi_22.3_mpionly_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-   tags:
-      - docker
-
-inteloneapi_22.3_hybrid_dbg:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-   tags:
-      - docker
-
-inteloneapi_22.3_hybrid_dbg_sp:
-   extends: .build_template
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/inteloneapi:22.3
-   variables:
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      WALBERLA_DOUBLE_ACCURACY: "OFF"
-      WALBERLA_BUILD_WITH_PARMETIS: "OFF"
-      WALBERLA_BUILD_WITH_METIS: "OFF"
-   tags:
-      - docker
-
 
 
 gcc_8_hybrid_dbg_noboost:
@@ -1966,23 +1546,24 @@ doc:
 ##                                                                           ##
 ###############################################################################
 
-clang-tidy:
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:11.0
-   script:
-      - $CXX --version
-      - clang-tidy -version
-      - cmake --version
-      - mkdir $CI_PROJECT_DIR/build
-      - cd $CI_PROJECT_DIR/build
-      - cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DWALBERLA_BUFFER_DEBUG=ON -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=ON -DCMAKE_BUILD_TYPE=Debug -DWALBERLA_BUILD_WITH_METIS=ON -DWALBERLA_BUILD_WITH_PARMETIS=ON -DWALBERLA_BUILD_WITH_OPENMESH=ON -DWALBERLA_DOUBLE_ACCURACY=ON -DWALBERLA_LOGLEVEL=DETAIL
-      - cmake . -LA
-      - utilities/filterCompileCommands.py compile_commands.json
-      - run-clang-tidy.py -quiet | tee clang-tidy-output.txt
-   artifacts:
-      paths:
-         - $CI_PROJECT_DIR/build/clang-tidy-output.txt
-   tags:
-      - docker
+#clang-tidy:
+#   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang-15
+#   script:
+#      - $CXX --version
+#      - clang-tidy -version
+#      - cmake --version
+#      - mkdir $CI_PROJECT_DIR/build
+#      - cd $CI_PROJECT_DIR/build
+#      - cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DWALBERLA_BUFFER_DEBUG=ON -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=ON -DCMAKE_BUILD_TYPE=Debug -DWALBERLA_BUILD_WITH_METIS=ON -DWALBERLA_BUILD_WITH_PARMETIS=ON -DWALBERLA_BUILD_WITH_OPENMESH=ON -DWALBERLA_DOUBLE_ACCURACY=ON -DWALBERLA_LOGLEVEL=DETAIL
+#      - cmake . -LA
+#      - utilities/filterCompileCommands.py compile_commands.json
+#      - wget https://raw.githubusercontent.com/llvm/llvm-project/main/clang-tools-extra/clang-tidy/tool/run-clang-tidy.py
+#      - python3 run-clang-tidy.py -quiet | tee clang-tidy-output.txt
+#   artifacts:
+#      paths:
+#         - $CI_PROJECT_DIR/build/clang-tidy-output.txt
+#   tags:
+#      - docker
 
 
 cppcheck:
@@ -2012,7 +1593,7 @@ coverage:
       - mkdir build
       - cd build
       - if dpkg --compare-versions `ompi_info | head -2 | tail -1 | sed 's/[^0-9.]*\([0-9.]*\).*/\1/'` ge 1.10; then export MPIEXEC_PREFLAGS="--allow-run-as-root" ; fi
-      - cmake .. -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=OFF -DCMAKE_BUILD_TYPE=DebugOptimized -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DWALBERLA_BUILD_WITH_CODEGEN=OFF -DWALBERLA_BUILD_WITH_GCOV=ON -DWALBERLA_LOGLEVEL=DETAIL
+      - cmake .. -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=OFF -DCMAKE_BUILD_TYPE=DebugOptimized -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DWALBERLA_BUILD_WITH_CODEGEN=OFF -DWALBERLA_BUILD_WITH_GCOV=ON  -DWALBERLA_LOGLEVEL=DETAIL
       - cmake . -LA
       - make -j $NUM_BUILD_CORES -l $NUM_CORES
       - ctest -LE longrun --output-on-failure -j $NUM_CORES --timeout 3000
@@ -2073,8 +1654,8 @@ coverage:
 mac_Serial_Dbg:
    extends: .mac_build_template
    before_script:
-      - pip3 install pystencils==1.3.2
-      - pip3 install lbmpy==1.3.2
+     - pip3 install pystencils==1.3.2
+     - pip3 install lbmpy==1.3.2
    variables:
       CMAKE_BUILD_TYPE: "DebugOptimized"
       CTEST_EXCLUDE_LABELS: "longrun"
@@ -2086,8 +1667,8 @@ mac_Serial_Dbg:
 mac_Serial:
    extends: .mac_build_template
    before_script:
-      - pip3 install pystencils==1.3.2
-      - pip3 install lbmpy==1.3.2
+     - pip3 install pystencils==1.3.2
+     - pip3 install lbmpy==1.3.2
    variables:
       CMAKE_BUILD_TYPE: "Release"
       CTEST_EXCLUDE_LABELS: "longrun"
@@ -2099,8 +1680,8 @@ mac_Serial:
 mac_MpiOnly_Dbg:
    extends: .mac_build_template
    before_script:
-      - pip3 install pystencils==1.3.2
-      - pip3 install lbmpy==1.3.2
+     - pip3 install pystencils==1.3.2
+     - pip3 install lbmpy==1.3.2
    variables:
       CMAKE_BUILD_TYPE: "DebugOptimized"
       CTEST_EXCLUDE_LABELS: "longrun"
@@ -2113,8 +1694,8 @@ mac_MpiOnly_Dbg:
 mac_MpiOnly:
    extends: .mac_build_template
    before_script:
-      - pip3 install pystencils==1.3.2
-      - pip3 install lbmpy==1.3.2
+     - pip3 install pystencils==1.3.2
+     - pip3 install lbmpy==1.3.2
    variables:
       CMAKE_BUILD_TYPE: "Release"
       CTEST_EXCLUDE_LABELS: "longrun"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3ff2ea2a89bd9c49c0b294585ed7cff6b9719447..fee94339c6bcbc8a6fd2280d9857314acf3b477e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -395,6 +395,8 @@ if( WALBERLA_CXX_COMPILER_IS_INTEL )
    # system headers are also supported by intel, but cmake does not recognize that
    set( CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem " )
    add_flag ( CMAKE_CXX_FLAGS "-wd2928,2504,2259,1682,597" )
+   # disable icc/icpc deprecation warning
+   add_flag ( CMAKE_CXX_FLAGS "-diag-disable=10441" )
 elseif( WALBERLA_CXX_COMPILER_IS_GNU )
    add_flag ( CMAKE_CXX_FLAGS "-Wfloat-equal -Wextra" )
 elseif( WALBERLA_CXX_COMPILER_IS_NEC )
diff --git a/src/core/Variant.h b/src/core/Variant.h
index 2be3f0a6c09e562dd48ef54b460dc08d786683d6..94c281593e2592e9dee4c26c14fd4ba947a70e87 100644
--- a/src/core/Variant.h
+++ b/src/core/Variant.h
@@ -21,9 +21,18 @@
 
 #pragma once
 
+// suppress conversion warning that is emitted by icpc compiler with `-Werror`
+#include "waLBerlaDefinitions.h"
+#if ( defined WALBERLA_CXX_COMPILER_IS_INTEL )
+#pragma warning(push)
+#pragma warning disable 68
+#endif
 
 #include <variant>
 
+#if ( defined WALBERLA_CXX_COMPILER_IS_INTEL )
+#pragma warning(pop)
+#endif
 
 
 namespace walberla