diff --git a/.editorconfig b/.editorconfig
index fc2c138..e22b8fb 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -17,3 +17,6 @@ trim_trailing_whitespace = false
 
 [*.puml]
 insert_final_newline = false
+
+[{Dockerfile,Dockerfile.*}]
+indent_size = 4
diff --git a/Dockerfile.jetty b/Dockerfile.jetty
index b30db9c..84422e4 100644
--- a/Dockerfile.jetty
+++ b/Dockerfile.jetty
@@ -27,17 +27,19 @@ RUN apt-get update && \
     /generate-jetty-start.sh
 
 # Build Graphviz from source because there are no binary distributions for recent versions
-ARG GRAPHVIZ_VERSION=8.0.2
+ARG GRAPHVIZ_VERSION
 ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         build-essential \
+        jq \
         libexpat1-dev \
         libgd-dev \
         zlib1g-dev \
         && \
     mkdir -p $GRAPHVIZ_BUILD_DIR && \
     cd $GRAPHVIZ_BUILD_DIR && \
+    GRAPHVIZ_VERSION=${GRAPHVIZ_VERSION:-$(curl -s https://gitlab.com/api/v4/projects/4207231/releases/ | jq -r '.[] | .name' | sort -V -r | head -1)} && \
     curl -o graphviz.tar.gz https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${GRAPHVIZ_VERSION}/graphviz-${GRAPHVIZ_VERSION}.tar.gz && \
     tar -xzf graphviz.tar.gz && \
     cd graphviz-$GRAPHVIZ_VERSION && \
@@ -46,6 +48,7 @@ RUN apt-get update && \
     make install && \
     apt-get remove -y \
         build-essential \
+        jq \
         libexpat1-dev \
         libgd-dev \
         zlib1g-dev \
diff --git a/Dockerfile.jetty-alpine b/Dockerfile.jetty-alpine
index afe854b..78258e2 100644
--- a/Dockerfile.jetty-alpine
+++ b/Dockerfile.jetty-alpine
@@ -25,16 +25,18 @@ RUN apk add --no-cache \
     /generate-jetty-start.sh
 
 #RUN apk add --no-cache graphviz
-ARG GRAPHVIZ_VERSION=8.0.2
+ARG GRAPHVIZ_VERSION
 ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
 RUN apk add --no-cache \
         g++ \
+        jq \
         libexpat \
         make \
         zlib \
         && \
     mkdir -p $GRAPHVIZ_BUILD_DIR && \
     cd $GRAPHVIZ_BUILD_DIR && \
+    GRAPHVIZ_VERSION=${GRAPHVIZ_VERSION:-$(curl -s https://gitlab.com/api/v4/projects/4207231/releases/ | jq -r '.[] | .name' | sort -V -r | head -1)} && \
     curl -o graphviz.tar.gz https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${GRAPHVIZ_VERSION}/graphviz-${GRAPHVIZ_VERSION}.tar.gz && \
     tar -xzf graphviz.tar.gz && \
     cd graphviz-$GRAPHVIZ_VERSION && \
@@ -43,6 +45,7 @@ RUN apk add --no-cache \
     make install && \
     apk del --no-cache \
         g++ \
+        jq \
         libexpat \
         make \
         zlib \
diff --git a/Dockerfile.tomcat b/Dockerfile.tomcat
index c2ce521..e4b0b97 100644
--- a/Dockerfile.tomcat
+++ b/Dockerfile.tomcat
@@ -19,17 +19,19 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Build Graphviz from source because there are no binary distributions for recent versions
-ARG GRAPHVIZ_VERSION=8.0.2
+ARG GRAPHVIZ_VERSION
 ARG GRAPHVIZ_BUILD_DIR=/tmp/graphiz-build
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
         build-essential \
+        jq \
         libexpat1-dev \
         libgd-dev \
         zlib1g-dev \
         && \
     mkdir -p $GRAPHVIZ_BUILD_DIR && \
     cd $GRAPHVIZ_BUILD_DIR && \
+    GRAPHVIZ_VERSION=${GRAPHVIZ_VERSION:-$(curl -s https://gitlab.com/api/v4/projects/4207231/releases/ | jq -r '.[] | .name' | sort -V -r | head -1)} && \
     curl -o graphviz.tar.gz https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${GRAPHVIZ_VERSION}/graphviz-${GRAPHVIZ_VERSION}.tar.gz && \
     tar -xzf graphviz.tar.gz && \
     cd graphviz-$GRAPHVIZ_VERSION && \
@@ -38,6 +40,7 @@ RUN apt-get update && \
     make install && \
     apt-get remove -y \
         build-essential \
+        jq \
         libexpat1-dev \
         libgd-dev \
         zlib1g-dev \