diff --git a/Dockerfile b/Dockerfile
index 444ade6a..a63c7c3c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,12 +6,16 @@ COPY settings.xml .
 RUN mvn verify --fail-never -P build --settings settings.xml
 
 COPY src ./src
-RUN mvn clean install -DskipTests -P build --settings settings.xml
+RUN mvn clean install -DskipTests -P build --settings settings.xml && \
+    java -Djarmode=layertools -jar target/*.jar extract --destination target/extracted
 
 FROM eclipse-temurin:17-jdk-alpine
 WORKDIR /app
 
-ARG JAR_FILE=target/*.jar
-COPY --from=build  /code/target/*.jar app.jar
 COPY GeoLite2-City ./GeoLite2-City
-ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar app.jar ${0} ${@}"]
\ No newline at end of file
+ARG JAR_FILE=target/*.jar
+COPY --from=build /code/target/extracted/dependencies/ ./
+COPY --from=build /code/target/extracted/spring-boot-loader/ ./
+COPY --from=build /code/target/extracted/snapshot-dependencies/ ./
+COPY --from=build /code/target/extracted/application/ ./
+ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher"]
\ No newline at end of file