diff --git a/Dockerfile b/Dockerfile
index 30b1e5a6f..68dfff9fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,8 +10,8 @@ COPY . .
 RUN mvn package -Dskip.failsafe.tests -q --batch-mode
 
 # Copy and make the jar executable
-RUN sh -c 'cp -r target/ dist/ && touch dist/app.jar'
+RUN sh -c 'mkdir dist/ && cp -a target/. dist/ && touch dist/spring-petclinic-*.jar'
 
 #Start the project
 ENV JAVA_OPTS=""
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar dist/app.jar" ]
+ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar dist/spring-petclinic-*.jar" ]