diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..1d085cacc
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+**
diff --git a/.editorconfig b/.editorconfig
index 5ede3cc0b..ca93e7bf8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -21,3 +21,7 @@ trim_trailing_whitespace = false
 
 [{pom.xml, *.yml}]
 indent_style = space
+
+[Dockerfile]
+indent_style = space
+indent_size = 2
diff --git a/Dockerfile b/Dockerfile
index 57cbdf1bc..bf85afd16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,26 @@
-FROM openjdk:17-alpine
+FROM alpine:latest AS loader
 
-ARG PLANTUML_VERSION=v1.2022.6
+ARG PLANTUML_VERSION
+
+RUN apk add --no-cache \
+  wget \
+  ca-certificates
+
+RUN wget \
+  "https://github.com/plantuml/plantuml/releases/download/${PLANTUML_VERSION}/plantuml-${PLANTUML_VERSION#?}.jar" \
+  -O /opt/plantuml.jar
+
+FROM openjdk:17-alpine
 
 ENV LANG en_US.UTF-8
 
-RUN \
-  apk add --no-cache graphviz wget ca-certificates ttf-dejavu && \
-  wget "https://github.com/plantuml/plantuml/releases/download/${PLANTUML_VERSION}/plantuml-${PLANTUML_VERSION#?}.jar" -O /opt/plantuml.jar && \
-  apk del wget ca-certificates
+RUN apk add --no-cache \
+  graphviz \
+  ttf-dejavu
+
+COPY --from=loader /opt/plantuml.jar /opt/plantuml.jar
 
 WORKDIR /data
-VOLUME ["/data"]
 
 ENTRYPOINT ["java", "-jar", "/opt/plantuml.jar"]
 CMD ["-version"]
\ No newline at end of file