diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index 151e6d47c27ea637aad99165ba0558d244cbdd35..763b2642a5c850a4d5b3cdc910962985c847239c 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit 151e6d47c27ea637aad99165ba0558d244cbdd35
+Subproject commit 763b2642a5c850a4d5b3cdc910962985c847239c
diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full
index 6bf918e8989248cec5ff17d908daf5faa8d88d20..1e6251098fce837a7c9549880398f3f9affb445b 100644
--- a/scripts/docker/Dockerfile.clang.full
+++ b/scripts/docker/Dockerfile.clang.full
@@ -2,7 +2,7 @@
 
 FROM ubuntu:18.04 AS build
 
-# Generated with ogs-container-maker 1.2.0
+# Generated with ogs-container-maker 1.4.3
 
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -15,16 +15,15 @@ RUN apt-get update -y && \
 # LLVM compiler
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        clang-9 && \
-    rm -rf /var/lib/apt/lists/*
-RUN update-alternatives --install /usr/bin/clang clang $(which clang-9) 30 && \
-    update-alternatives --install /usr/bin/clang++ clang++ $(which clang++-9) 30
-
-RUN apt-get update -y && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        clang-9 \
         clang-format-9 \
-        clang-tidy-9 && \
+        clang-tidy-9 \
+        libomp-dev && \
     rm -rf /var/lib/apt/lists/*
+RUN update-alternatives --install /usr/bin/clang clang $(which clang-9) 30 && \
+    update-alternatives --install /usr/bin/clang++ clang++ $(which clang++-9) 30 && \
+    update-alternatives --install /usr/bin/clang-format clang-format $(which clang-format-9) 30 && \
+    update-alternatives --install /usr/bin/clang-tidy clang-tidy $(which clang-tidy-9) 30
 
 # pip
 RUN apt-get update -y && \
diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full
index 6dd63f23eef90f7cc42bb8f6647841d9b2498c1b..3c663b19609122cf012797dfb8f21a12e380fc87 100644
--- a/scripts/docker/Dockerfile.gcc.full
+++ b/scripts/docker/Dockerfile.gcc.full
@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:experimental
 
-FROM ubuntu:19.04 AS build
+FROM ubuntu:19.10 AS build
 
-# Generated with ogs-container-maker 1.2.0
+# Generated with ogs-container-maker 1.4.3
 
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui
index 7e5b089000b63fd5e3710e7c67033e3fd519c96c..0eeee444a61294f0090e6113b6afb35508b07023 100644
--- a/scripts/docker/Dockerfile.gcc.gui
+++ b/scripts/docker/Dockerfile.gcc.gui
@@ -1,8 +1,8 @@
 # syntax=docker/dockerfile:experimental
 
-FROM ubuntu:19.04 AS build
+FROM ubuntu:19.10 AS build
 
-# Generated with ogs-container-maker 1.2.0
+# Generated with ogs-container-maker 1.4.3
 
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -104,6 +104,16 @@ LABEL org.opengeosys.pm=conan \
     org.opengeosys.pm.conan.version=1.22.2
 LABEL org.opengeosys.pm.conan.user_home=/opt/conan
 
+# CVode version 2.8.2
+# https://github.com/ufz/cvode/archive/2.8.2.tar.gz
+RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/ufz/cvode/archive/2.8.2.tar.gz && \
+    mkdir -p /var/tmp && tar -x -f /var/tmp/2.8.2.tar.gz -C /var/tmp -z && \
+    mkdir -p /var/tmp/cvode-2.8.2/build && cd /var/tmp/cvode-2.8.2/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cvode -D CMAKE_INSTALL_PREFIX=/usr/local/cvode -D EXAMPLES_INSTALL=OFF -D BUILD_SHARED_LIBS=OFF -D CMAKE_POSITION_INDEPENDENT_CODE=ON /var/tmp/cvode-2.8.2 && \
+    cmake --build /var/tmp/cvode-2.8.2/build --target all -- -j$(nproc) && \
+    cmake --build /var/tmp/cvode-2.8.2/build --target install -- -j$(nproc) && \
+    rm -rf /var/tmp/cvode-2.8.2 /var/tmp/2.8.2.tar.gz
+ENV CVODE_ROOT=/usr/local/cvode
+
 # cppcheck version 1.87
 # https://github.com/danmar/cppcheck/archive/1.87.tar.gz
 RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.87.tar.gz && \
@@ -114,6 +124,13 @@ RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://
     rm -rf /var/tmp/cppcheck-1.87 /var/tmp/1.87.tar.gz
 ENV PATH=/usr/local/cppcheck/bin:$PATH
 
+RUN apt-get update -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        doxygen \
+        graphviz \
+        texlive-base && \
+    rm -rf /var/lib/apt/lists/*
+
 # pip
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \