diff --git a/Dockerfile b/Dockerfile
index 010acec8f..361d02972 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,23 +24,21 @@ WORKDIR /fineract
 
 RUN ./gradlew --no-daemon -q -x rat -x compileTestJava -x test -x spotlessJavaCheck -x spotlessJava bootJar
 
-WORKDIR /fineract/target
-RUN jar -xf /fineract/fineract-provider/build/libs/fineract-provider*.jar
-
 # https://issues.apache.org/jira/browse/LEGAL-462
 # https://issues.apache.org/jira/browse/FINERACT-762
 # We include an alternative JDBC driver (which is faster, but not allowed to be default in Apache distribution)
 # allowing implementations to switch the driver used by changing start-up parameters (for both tenants and each tenant DB)
 # The commented out lines in the docker-compose.yml illustrate how to do this.
-WORKDIR /fineract/target/BOOT-INF/lib
-RUN wget -q https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.20/mysql-connector-java-8.0.20.jar
+WORKDIR /fineract/libs
+RUN wget -q https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.23/mysql-connector-java-8.0.23.jar
 
 # =========================================
 
 FROM gcr.io/distroless/java:11 as fineract
 
-COPY --from=builder /fineract/target/BOOT-INF/lib /app/lib
-COPY --from=builder /fineract/target/META-INF /app/META-INF
-COPY --from=builder /fineract/target/BOOT-INF/classes /app
+COPY --from=builder /fineract/fineract-provider/build/libs /app
+COPY --from=builder /fineract/libs /app/libs
 
-ENTRYPOINT ["java", "-cp", "app:app/lib/*", "org.apache.fineract.ServerApplication"]
+WORKDIR /app
+
+ENTRYPOINT ["java", "-Dloader.path=/app/libs/", "-jar", "/app/fineract-provider.jar"]
diff --git a/fineract-provider/build.gradle b/fineract-provider/build.gradle
index 2de63aa29..2e6fa024e 100644
--- a/fineract-provider/build.gradle
+++ b/fineract-provider/build.gradle
@@ -250,6 +250,9 @@ springBoot {
 
 bootJar {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    manifest {
+        attributes 'Main-Class': 'org.springframework.boot.loader.PropertiesLauncher'
+    }
 }
 
 bootWar {