diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..6975714
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+# .dockerignore -- stuff we don't need during image builds
+
+/.git/
diff --git a/Dockerfile.jetty b/Dockerfile.jetty
index e71f144..1a06a5b 100644
--- a/Dockerfile.jetty
+++ b/Dockerfile.jetty
@@ -1,15 +1,10 @@
 FROM maven:3-jdk-8 AS builder
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
-    apt-get clean
-
 COPY pom.xml /app/
 COPY src /app/src/
 
-ENV MAVEN_CONFIG=/app/.m2
 WORKDIR /app
-RUN mvn package
+RUN mvn --batch-mode --define java.net.useSystemProxies=true package
 
 ########################################################################################
 
@@ -24,6 +19,7 @@ RUN apt-get update && \
 
 USER jetty
 
-COPY --from=builder /app/target/plantuml.war /var/lib/jetty/webapps/ROOT.war
-
+ENV GRAPHVIZ_DOT=/usr/bin/dot
 
+ARG BASE_URL=plantuml
+COPY --from=builder /app/target/plantuml.war /var/lib/jetty/webapps/$BASE_URL.war
diff --git a/Dockerfile.tomcat b/Dockerfile.tomcat
index 7d4b20d..9024999 100644
--- a/Dockerfile.tomcat
+++ b/Dockerfile.tomcat
@@ -1,15 +1,10 @@
 FROM maven:3-jdk-8 AS builder
 
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
-    apt-get clean
-
 COPY pom.xml /app/
 COPY src /app/src/
 
-ENV MAVEN_CONFIG=/app/.m2
 WORKDIR /app
-RUN mvn package
+RUN mvn --batch-mode --define java.net.useSystemProxies=true package
 
 ########################################################################################
 
@@ -20,5 +15,8 @@ RUN apt-get update && \
     apt-get install -y --no-install-recommends graphviz fonts-wqy-zenhei && \
     apt-get clean
 
-RUN rm -rf /usr/local/tomcat/webapps/ROOT
-COPY --from=builder /app/target/plantuml.war /usr/local/tomcat/webapps/ROOT.war
+ENV GRAPHVIZ_DOT=/usr/bin/dot
+
+ARG BASE_URL=plantuml
+RUN rm -rf /usr/local/tomcat/webapps/$BASE_URL
+COPY --from=builder /app/target/plantuml.war /usr/local/tomcat/webapps/$BASE_URL.war