diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full
index ea6ed90e84240b0f9b84c6a742c847e95aeff4c7..cbd0a78e6b7d4158c0a862d95aa0873d4f6d6db1 100644
--- a/scripts/docker/Dockerfile.clang.full
+++ b/scripts/docker/Dockerfile.clang.full
@@ -1,6 +1,6 @@
 FROM ubuntu:17.10
 
-# Generated with https://github.com/ufz/ogs-container-maker/commit/0930f12
+# Generated with https://github.com/ufz/ogs-container-maker/commit/9f130d9
 
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -19,7 +19,8 @@ RUN update-alternatives --install /usr/bin/clang clang $(which clang-5.0) 30 &&
 
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        clang-tidy-5.0 && \
+        clang-tidy-5.0 \
+        clang-format-5.0 && \
     rm -rf /var/lib/apt/lists/*
 
 # OGS base building block
@@ -102,6 +103,11 @@ ENV CCACHE_DIR=/opt/cache \
 LABEL ccache.dir=/opt/cache \
     ccache.size=15G
 
+RUN apt-get update -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        sudo && \
+    rm -rf /var/lib/apt/lists/*
+
 # Jenkins node
 RUN groupadd --gid 1001 jenkins && \
     adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \
diff --git a/scripts/docker/Dockerfile.clang.minimal b/scripts/docker/Dockerfile.clang.minimal
index 82f4eb825da0af3f3fb3d80d3ad65c80aeafc933..90fe6ad881481529b351bb237888b5174ddfeccc 100644
--- a/scripts/docker/Dockerfile.clang.minimal
+++ b/scripts/docker/Dockerfile.clang.minimal
@@ -1,6 +1,6 @@
 FROM ubuntu:17.10
 
-# Generated with https://github.com/ufz/ogs-container-maker/commit/0930f12
+# Generated with https://github.com/ufz/ogs-container-maker/commit/9f130d9
 
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -19,7 +19,8 @@ RUN update-alternatives --install /usr/bin/clang clang $(which clang-5.0) 30 &&
 
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-        clang-tidy-5.0 && \
+        clang-tidy-5.0 \
+        clang-format-5.0 && \
     rm -rf /var/lib/apt/lists/*
 
 # OGS base building block
@@ -87,6 +88,11 @@ ENV CCACHE_DIR=/opt/cache \
 LABEL ccache.dir=/opt/cache \
     ccache.size=15G
 
+RUN apt-get update -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        sudo && \
+    rm -rf /var/lib/apt/lists/*
+
 # Jenkins node
 RUN groupadd --gid 1001 jenkins && \
     adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \
diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full
index 9f0bc50aaac2d60e52027cd014a2ff974741f34e..88040137147668bf06f7a58241c57b08335a4355 100644
--- a/scripts/docker/Dockerfile.gcc.full
+++ b/scripts/docker/Dockerfile.gcc.full
@@ -1,6 +1,6 @@
 FROM ubuntu:17.10
 
-# Generated with https://github.com/ufz/ogs-container-maker/commit/0930f12
+# Generated with https://github.com/ufz/ogs-container-maker/commit/9f130d9
 
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -99,8 +99,7 @@ RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         doxygen \
         graphviz \
-        texlive-base \
-        sudo && \
+        texlive-base && \
     rm -rf /var/lib/apt/lists/*
 
 # pip
@@ -124,6 +123,11 @@ ENV CCACHE_DIR=/opt/cache \
 LABEL ccache.dir=/opt/cache \
     ccache.size=15G
 
+RUN apt-get update -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        sudo && \
+    rm -rf /var/lib/apt/lists/*
+
 # Jenkins node
 RUN groupadd --gid 1001 jenkins && \
     adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \
diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui
index 486b6b5dc92e41423aa62a3fa2fbf8730fb3fe79..99712f98e317509eac4d132f5586c6c7f5cc97a8 100644
--- a/scripts/docker/Dockerfile.gcc.gui
+++ b/scripts/docker/Dockerfile.gcc.gui
@@ -1,6 +1,6 @@
 FROM ubuntu:17.10
 
-# Generated with https://github.com/ufz/ogs-container-maker/commit/0930f12
+# Generated with https://github.com/ufz/ogs-container-maker/commit/9f130d9
 
 RUN apt-get update -y && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -96,6 +96,11 @@ ENV CCACHE_DIR=/opt/cache \
 LABEL ccache.dir=/opt/cache \
     ccache.size=15G
 
+RUN apt-get update -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        sudo && \
+    rm -rf /var/lib/apt/lists/*
+
 # Jenkins node
 RUN groupadd --gid 1001 jenkins && \
     adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \