diff --git a/Dockerfile b/Dockerfile
index dbf03a32b..1498384e2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,3 +1,9 @@
-FROM eclipse-temurin:17-jdk-alpine
-COPY build/libs/*.jar app.jar
-ENTRYPOINT ["java", "-jar", "/app.jar"]
+FROM gradle:8.5-jdk17 as builder
+COPY . /app
+WORKDIR /app
+RUN gradle build -x test
+
+FROM eclipse-temurin:17-jre-alpine
+WORKDIR/app
+COPY --from=builder /app/build/libs/spring-petclinic-*.jar app.jar
+ENTRYPOINT ["java", "-jar", "app.jar"]