diff --git a/Dockerfile b/Dockerfile
index 8a38986..5289b04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,11 @@
+FROM openjdk:8-jre-alpine AS builder
+
+RUN apk update && apk add gradle git && rm -rf /var/lib/apk/* /var/cache/apk/*
+
+WORKDIR /ma1sd
+COPY . .
+RUN ./gradlew shadowJar
+
 FROM openjdk:8-jre-alpine
 
 RUN apk update && apk add bash && rm -rf /var/lib/apk/* /var/cache/apk/*
@@ -15,4 +23,4 @@ CMD [ "/start.sh" ]
 
 ADD src/docker/start.sh /start.sh
 ADD src/script/ma1sd /app/ma1sd
-ADD build/libs/ma1sd.jar /app/ma1sd.jar
+COPY --from=builder /ma1sd/build/libs/ma1sd.jar /app/ma1sd.jar
diff --git a/build.gradle b/build.gradle
index fa081b2..bed09a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -264,7 +264,7 @@ task debBuild(dependsOn: shadowJar) {
     }
 }
 
-task dockerBuild(type: Exec, dependsOn: shadowJar) {
+task dockerBuild(type: Exec) {
     commandLine 'docker', 'build', '-t', dockerImageTag, project.rootDir
 
     doLast {