diff --git a/Dockerfile b/Dockerfile
index b7b5afd6b..583bfb977 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,16 @@
-FROM openjdk:latest
-
-WORKDIR /tmp/
-
-COPY . .
-
+FROM openjdk:8-jdk-alpine AS	build
+WORKDIR /build
+COPY .mvn .mvn
+COPY mvnw .
+COPY mvnw.cmd .
+COPY pom.xml .
+RUN ./mvnw -B -e dependency:go-offline
+COPY src src
 RUN ./mvnw package
 
+FROM openjdk:8-jre-alpine
 EXPOSE 8080
-
-CMD ./mvnw spring-boot:run -Dspring-boot.run.profiles=mysql
+ENTRYPOINT [ "java" ]
+CMD [ "-jar", "-Dspring.profiles.active=mysql" ,"app.jar" ]
+COPY --from=build /build/target/*.jar /app/app.jar
+WORKDIR /app
diff --git a/docker-compose.yml b/docker-compose.yml
index 290fe09ed..6d4397795 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,10 @@
 services:
   app:
     image: hllvc/spring-petclinic:latest
-    ports:
-      - "3000:8080"
     links:
       - mysql:mysql
+    ports:
+      - "3000:8080"
   mysql:
     image: mysql:5.7
     ports: