diff --git a/config b/config
index d907d62b3..279c78154 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit d907d62b328700e04f979283dae99fb132978235
+Subproject commit 279c78154ec82a9673331dff934e2e48e6e7d848
diff --git a/src/apps/base-images/geoserver/Dockerfile b/src/apps/base-images/geoserver/Dockerfile
index 9717c6dbf..6c104a464 100644
--- a/src/apps/base-images/geoserver/Dockerfile
+++ b/src/apps/base-images/geoserver/Dockerfile
@@ -4,7 +4,7 @@ FROM $REPOSITORY/gs-cloud-base-jre:$TAG AS builder
 ARG JAR_FILE=target/gs-cloud-*-bin.jar
 
 COPY ${JAR_FILE} application.jar
-RUN java -Djarmode=layertools -jar application.jar extract
+RUN java -Djarmode=tools -jar application.jar extract --layers --launcher
 
 ##########
 FROM $REPOSITORY/gs-cloud-base-spring-boot:$TAG
@@ -44,9 +44,9 @@ RUN mkdir -p /opt/app/data_directory /data/geowebcache \
 && chmod 0777 /opt/app/data_directory /data/geowebcache
 
 WORKDIR /opt/app/bin
-COPY --from=builder dependencies/ ./
+COPY --from=builder lib/ ./
 COPY --from=builder snapshot-dependencies/ ./
-COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/base-images/spring-boot/Dockerfile b/src/apps/base-images/spring-boot/Dockerfile
index 6df4b56a8..324ee8ed8 100644
--- a/src/apps/base-images/spring-boot/Dockerfile
+++ b/src/apps/base-images/spring-boot/Dockerfile
@@ -7,7 +7,7 @@ ARG JAR_FILE=target/gs-cloud-*-bin.jar
 
 COPY ${JAR_FILE} application.jar
 
-RUN java -Djarmode=layertools -jar application.jar extract
+RUN java -Djarmode=tools -jar application.jar extract --layers --launcher
 
 ##########
 FROM $REPOSITORY/gs-cloud-base-jre:$TAG
@@ -31,13 +31,13 @@ WORKDIR /opt/app/bin
 EXPOSE 8080
 EXPOSE 8081
 
-COPY --from=builder dependencies/ ./
+COPY --from=builder lib/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
 COPY --from=builder snapshot-dependencies/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
-COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 
 HEALTHCHECK \
 --interval=10s \
diff --git a/src/apps/geoserver/gwc/Dockerfile b/src/apps/geoserver/gwc/Dockerfile
index 0467090bc..c7e2d0aeb 100644
--- a/src/apps/geoserver/gwc/Dockerfile
+++ b/src/apps/geoserver/gwc/Dockerfile
@@ -7,16 +7,16 @@ ARG JAR_FILE=target/gs-cloud-*-bin.jar
 
 COPY ${JAR_FILE} application.jar
 
-RUN java -Djarmode=layertools -jar application.jar extract
+RUN java -Djarmode=tools -jar application.jar extract --layers --launcher
 
 ##########
 FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 
 # WORKDIR already set to /opt/app/bin
 
-COPY --from=builder dependencies/ ./
+COPY --from=builder lib/ ./
 COPY --from=builder snapshot-dependencies/ ./
-COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/geoserver/restconfig/Dockerfile b/src/apps/geoserver/restconfig/Dockerfile
index 0467090bc..c7e2d0aeb 100644
--- a/src/apps/geoserver/restconfig/Dockerfile
+++ b/src/apps/geoserver/restconfig/Dockerfile
@@ -7,16 +7,16 @@ ARG JAR_FILE=target/gs-cloud-*-bin.jar
 
 COPY ${JAR_FILE} application.jar
 
-RUN java -Djarmode=layertools -jar application.jar extract
+RUN java -Djarmode=tools -jar application.jar extract --layers --launcher
 
 ##########
 FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 
 # WORKDIR already set to /opt/app/bin
 
-COPY --from=builder dependencies/ ./
+COPY --from=builder lib/ ./
 COPY --from=builder snapshot-dependencies/ ./
-COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/geoserver/wcs/Dockerfile b/src/apps/geoserver/wcs/Dockerfile
index 0467090bc..c7e2d0aeb 100644
--- a/src/apps/geoserver/wcs/Dockerfile
+++ b/src/apps/geoserver/wcs/Dockerfile
@@ -7,16 +7,16 @@ ARG JAR_FILE=target/gs-cloud-*-bin.jar
 
 COPY ${JAR_FILE} application.jar
 
-RUN java -Djarmode=layertools -jar application.jar extract
+RUN java -Djarmode=tools -jar application.jar extract --layers --launcher
 
 ##########
 FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 
 # WORKDIR already set to /opt/app/bin
 
-COPY --from=builder dependencies/ ./
+COPY --from=builder lib/ ./
 COPY --from=builder snapshot-dependencies/ ./
-COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/geoserver/webui/Dockerfile b/src/apps/geoserver/webui/Dockerfile
index 0467090bc..c7e2d0aeb 100644
--- a/src/apps/geoserver/webui/Dockerfile
+++ b/src/apps/geoserver/webui/Dockerfile
@@ -7,16 +7,16 @@ ARG JAR_FILE=target/gs-cloud-*-bin.jar
 
 COPY ${JAR_FILE} application.jar
 
-RUN java -Djarmode=layertools -jar application.jar extract
+RUN java -Djarmode=tools -jar application.jar extract --layers --launcher
 
 ##########
 FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 
 # WORKDIR already set to /opt/app/bin
 
-COPY --from=builder dependencies/ ./
+COPY --from=builder lib/ ./
 COPY --from=builder snapshot-dependencies/ ./
-COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/geoserver/wfs/Dockerfile b/src/apps/geoserver/wfs/Dockerfile
index 0467090bc..c7e2d0aeb 100644
--- a/src/apps/geoserver/wfs/Dockerfile
+++ b/src/apps/geoserver/wfs/Dockerfile
@@ -7,16 +7,16 @@ ARG JAR_FILE=target/gs-cloud-*-bin.jar
 
 COPY ${JAR_FILE} application.jar
 
-RUN java -Djarmode=layertools -jar application.jar extract
+RUN java -Djarmode=tools -jar application.jar extract --layers --launcher
 
 ##########
 FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 
 # WORKDIR already set to /opt/app/bin
 
-COPY --from=builder dependencies/ ./
+COPY --from=builder lib/ ./
 COPY --from=builder snapshot-dependencies/ ./
-COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/geoserver/wms/Dockerfile b/src/apps/geoserver/wms/Dockerfile
index 0467090bc..c7e2d0aeb 100644
--- a/src/apps/geoserver/wms/Dockerfile
+++ b/src/apps/geoserver/wms/Dockerfile
@@ -7,16 +7,16 @@ ARG JAR_FILE=target/gs-cloud-*-bin.jar
 
 COPY ${JAR_FILE} application.jar
 
-RUN java -Djarmode=layertools -jar application.jar extract
+RUN java -Djarmode=tools -jar application.jar extract --layers --launcher
 
 ##########
 FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 
 # WORKDIR already set to /opt/app/bin
 
-COPY --from=builder dependencies/ ./
+COPY --from=builder lib/ ./
 COPY --from=builder snapshot-dependencies/ ./
-COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/geoserver/wps/Dockerfile b/src/apps/geoserver/wps/Dockerfile
index 0467090bc..c7e2d0aeb 100644
--- a/src/apps/geoserver/wps/Dockerfile
+++ b/src/apps/geoserver/wps/Dockerfile
@@ -7,16 +7,16 @@ ARG JAR_FILE=target/gs-cloud-*-bin.jar
 
 COPY ${JAR_FILE} application.jar
 
-RUN java -Djarmode=layertools -jar application.jar extract
+RUN java -Djarmode=tools -jar application.jar extract --layers --launcher
 
 ##########
 FROM $REPOSITORY/gs-cloud-base-geoserver-image:$TAG
 
 # WORKDIR already set to /opt/app/bin
 
-COPY --from=builder dependencies/ ./
+COPY --from=builder lib/ ./
 COPY --from=builder snapshot-dependencies/ ./
-COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/infrastructure/config/Dockerfile b/src/apps/infrastructure/config/Dockerfile
index bb459f8d1..7a686782c 100644
--- a/src/apps/infrastructure/config/Dockerfile
+++ b/src/apps/infrastructure/config/Dockerfile
@@ -6,16 +6,16 @@ ARG JAR_FILE=target/gs-cloud-*-bin.jar
 
 COPY ${JAR_FILE} application.jar
 
-RUN java -Djarmode=layertools -jar application.jar extract
+RUN java -Djarmode=tools -jar application.jar extract --layers --launcher
 
 ##########
 FROM $REPOSITORY/gs-cloud-base-spring-boot:$TAG
 
 # WORKDIR already set to /opt/app/bin
 
-COPY --from=builder dependencies/ ./
+COPY --from=builder lib/ ./
 COPY --from=builder snapshot-dependencies/ ./
-COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/infrastructure/gateway-webflux/Dockerfile b/src/apps/infrastructure/gateway-webflux/Dockerfile
index 0bc418a57..81522c976 100644
--- a/src/apps/infrastructure/gateway-webflux/Dockerfile
+++ b/src/apps/infrastructure/gateway-webflux/Dockerfile
@@ -6,15 +6,15 @@ ARG JAR_FILE=target/gs-cloud-*-bin.jar
 
 COPY ${JAR_FILE} application.jar
 
-RUN java -Djarmode=layertools -jar application.jar extract
+RUN java -Djarmode=tools -jar application.jar extract --layers --launcher
 
 ##########
 FROM $REPOSITORY/gs-cloud-base-spring-boot:$TAG
 # WORKDIR already set to /opt/app/bin
 
-COPY --from=builder dependencies/ ./
+COPY --from=builder lib/ ./
 COPY --from=builder snapshot-dependencies/ ./
-COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
 COPY --from=builder application/ ./
diff --git a/src/apps/infrastructure/gateway-webmvc/Dockerfile b/src/apps/infrastructure/gateway-webmvc/Dockerfile
index 0bc418a57..81522c976 100644
--- a/src/apps/infrastructure/gateway-webmvc/Dockerfile
+++ b/src/apps/infrastructure/gateway-webmvc/Dockerfile
@@ -6,15 +6,15 @@ ARG JAR_FILE=target/gs-cloud-*-bin.jar
 
 COPY ${JAR_FILE} application.jar
 
-RUN java -Djarmode=layertools -jar application.jar extract
+RUN java -Djarmode=tools -jar application.jar extract --layers --launcher
 
 ##########
 FROM $REPOSITORY/gs-cloud-base-spring-boot:$TAG
 # WORKDIR already set to /opt/app/bin
 
-COPY --from=builder dependencies/ ./
+COPY --from=builder lib/ ./
 COPY --from=builder snapshot-dependencies/ ./
-COPY --from=builder spring-boot-loader/ ./
+COPY --from=builder application/ ./
 #see https://github.com/moby/moby/issues/37965
 RUN true
 COPY --from=builder application/ ./