diff --git a/Dockerfile.jetty b/Dockerfile.jetty
index 68f077e..93bd2a6 100644
--- a/Dockerfile.jetty
+++ b/Dockerfile.jetty
@@ -1,3 +1,16 @@
+FROM maven:3-jdk-8 AS builder
+
+RUN apt-get update && apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && rm -rf /var/lib/apt/lists/*
+
+COPY pom.xml /app/
+COPY src /app/src/
+
+ENV MAVEN_CONFIG=/app/.m2
+WORKDIR /app
+RUN mvn package
+
+########################################################################################
+
 FROM jetty
 MAINTAINER D.Ducatel
 
@@ -5,4 +18,6 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
     rm -rf /var/lib/apt/lists/*
 
-ADD target/plantuml.war /var/lib/jetty/webapps/ROOT.war
+COPY --from=builder /app/target/plantuml.war /var/lib/jetty/webapps/ROOT.war
+
+
diff --git a/Dockerfile.tomcat b/Dockerfile.tomcat
index e8bb7db..4542bec 100644
--- a/Dockerfile.tomcat
+++ b/Dockerfile.tomcat
@@ -1,3 +1,16 @@
+FROM maven:3-jdk-8 AS builder
+
+RUN apt-get update && apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && rm -rf /var/lib/apt/lists/*
+
+COPY pom.xml /app/
+COPY src /app/src/
+
+ENV MAVEN_CONFIG=/app/.m2
+WORKDIR /app
+RUN mvn package
+
+########################################################################################
+
 FROM tomcat:9
 MAINTAINER D.Ducatel
 
@@ -6,4 +19,4 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 RUN rm -rf /usr/local/tomcat/webapps/ROOT
-ADD target/plantuml.war /usr/local/tomcat/webapps/ROOT.war
+COPY --from=builder /app/target/plantuml.war /usr/local/tomcat/webapps/ROOT.war