diff --git a/java/client/Dockerfile b/java/client/Dockerfile
index 64a103e2..e198d0fa 100644
--- a/java/client/Dockerfile
+++ b/java/client/Dockerfile
@@ -1,7 +1,19 @@
+FROM maven:3.5.2-jdk-8 AS build
+
+RUN apt-get update
+RUN apt-get install -y curl
+RUN update-ca-certificates -f
+
+WORKDIR /usr/src/app
+RUN wget https://repo1.maven.org/maven2/io/opentracing/contrib/specialagent/opentracing-specialagent/1.7.0/opentracing-specialagent-1.7.0.jar
+COPY src ./src
+COPY pom.xml pom.xml
+RUN mvn -f /usr/src/app/pom.xml clean package
+
 FROM openjdk:8-jre-alpine
 
-ADD target/client-1.0-SNAPSHOT.jar /app/
-ADD opentracing-specialagent-1.7.0.jar /app/
+COPY --from=build /usr/src/app/opentracing-specialagent-1.7.0.jar /app/
+COPY --from=build /usr/src/app/target/client-1.0-SNAPSHOT.jar /app/
 
 ENTRYPOINT java -javaagent:/app/opentracing-specialagent-1.7.0.jar  \
         -Dsa.tracer=lightstep \
diff --git a/java/server/Dockerfile b/java/server/Dockerfile
index a0f5f9ad..dabf3820 100644
--- a/java/server/Dockerfile
+++ b/java/server/Dockerfile
@@ -1,7 +1,19 @@
+FROM maven:3.5.2-jdk-8 AS build
+
+RUN apt-get update
+RUN apt-get install -y curl
+RUN update-ca-certificates -f
+
+WORKDIR /usr/src/app
+RUN wget https://repo1.maven.org/maven2/io/opentracing/contrib/specialagent/opentracing-specialagent/1.7.0/opentracing-specialagent-1.7.0.jar
+COPY src ./src
+COPY pom.xml pom.xml
+RUN mvn -f /usr/src/app/pom.xml clean package
+
 FROM openjdk:8-jre-alpine
 
-ADD target/server-1.0-SNAPSHOT.jar /app/
-ADD opentracing-specialagent-1.7.0.jar /app/
+COPY --from=build /usr/src/app/opentracing-specialagent-1.7.0.jar /app/
+COPY --from=build /usr/src/app/target/server-1.0-SNAPSHOT.jar /app/
 
 ENTRYPOINT java -javaagent:/app/opentracing-specialagent-1.7.0.jar  \
         -Dsa.tracer=lightstep \