diff --git a/ci/all-kaniko-builds.gitlab-ci.yml b/ci/all-kaniko-builds.gitlab-ci.yml
index 45697f1d5f9760056259de21dd48117c9a2201f7..1dd6ba7fb062c886c68821928da9bfa816edd90b 100644
--- a/ci/all-kaniko-builds.gitlab-ci.yml
+++ b/ci/all-kaniko-builds.gitlab-ci.yml
@@ -71,7 +71,7 @@ kaniko:xplan-dokumente-api:
   extends: .kaniko:build
   variables:
     dockerImageName: xplan-dokumente-api
-    tarGzFile: xplan-api/xplan-api-dokumente/target/docker/xplanbox/xplan-dokumente-api/tmp/docker-build.tar.gz
+    tarGzFile: xplan-dokumente/xplan-dokumente-api/target/docker/xplanbox/xplan-dokumente-api/tmp/docker-build.tar.gz
   needs:
     - maven-prepare-docker-contexts-apis-and-inspire-plu
     - kaniko:xplan-docker-tomcat
@@ -79,8 +79,8 @@ kaniko:xplan-dokumente-api:
 kaniko:xplan-inspireplu:
   extends: .kaniko:build
   variables:
-    dockerImageName: xplan-inspireplu
-    tarGzFile: xplan-webservices/xplan-inspireplu/target/docker/xplanbox/xplan-inspireplu/tmp/docker-build.tar.gz
+    dockerImageName: xplan-webservices-inspireplu
+    tarGzFile: xplan-webservices/xplan-webservices-inspireplu/target/docker/xplanbox/xplan-webservices-inspireplu/tmp/docker-build.tar.gz
   needs:
     - maven-prepare-docker-contexts-apis-and-inspire-plu
 
@@ -88,7 +88,7 @@ kaniko:xplan-manager-api:
   extends: .kaniko:build
   variables:
     dockerImageName: xplan-manager-api
-    tarGzFile: xplan-api/xplan-api-manager/target/docker/xplanbox/xplan-manager-api/tmp/docker-build.tar.gz
+    tarGzFile: xplan-manager/xplan-manager-api/target/docker/xplanbox/xplan-manager-api/tmp/docker-build.tar.gz
   needs:
     - maven-prepare-docker-contexts-apis-and-inspire-plu
     - kaniko:xplan-docker-tomcat-gdal
@@ -97,7 +97,7 @@ kaniko:xplan-mapproxy:
   extends: .kaniko:build
   variables:
     dockerImageName: xplan-mapproxy
-    tarGzFile: xplan-docker/xplan-docker-mapproxy/target/docker/xplanbox/xplan-mapproxy/tmp/docker-build.tar.gz
+    tarGzFile: xplan-webservices/xplan-webservices-mapproxy/xplan-mapproxy-docker/target/docker/xplanbox/xplan-mapproxy/tmp/docker-build.tar.gz
   needs:
     - maven-prepare-docker-contexts-others
 
@@ -105,7 +105,7 @@ kaniko:xplan-mapserver:
   extends: .kaniko:build
   variables:
     dockerImageName: xplan-mapserver
-    tarGzFile: xplan-docker/xplan-docker-mapserver/target/docker/xplanbox/xplan-mapserver/tmp/docker-build.tar.gz
+    tarGzFile: xplan-webservices/xplan-webservices-mapserver/xplan-mapserver-docker/target/docker/xplanbox/xplan-mapserver/tmp/docker-build.tar.gz
   needs:
     - maven-prepare-docker-contexts-others
 
@@ -113,7 +113,7 @@ kaniko:xplan-manager-web:
   extends: .kaniko:build
   variables:
     dockerImageName: xplan-manager-web
-    tarGzFile: xplan-webapps/xplan-manager-web/target/docker/xplanbox/xplan-manager-web/tmp/docker-build.tar.gz
+    tarGzFile: xplan-manager/xplan-manager-web/target/docker/xplanbox/xplan-manager-web/tmp/docker-build.tar.gz
   needs:
     - maven-prepare-docker-contexts-web-apps
     - kaniko:xplan-docker-tomcat-gdal
@@ -122,7 +122,7 @@ kaniko:xplan-root:
   extends: .kaniko:build
   variables:
     dockerImageName: xplan-root
-    tarGzFile: xplan-webapps/xplan-root/target/docker/xplanbox/xplan-root/tmp/docker-build.tar.gz
+    tarGzFile: xplan-documentation/xplan-webpages/target/docker/xplanbox/xplan-webpages/tmp/docker-build.tar.gz
   needs:
     - maven-prepare-docker-contexts-web-apps
     
@@ -130,7 +130,7 @@ kaniko:xplan-services:
   extends: .kaniko:build
   variables:
     dockerImageName: xplan-services
-    tarGzFile: xplan-webservices/xplan-services-docker/target/docker/xplanbox/xplan-services/tmp/docker-build.tar.gz
+    tarGzFile: xplan-webservices/xplan-webservices-services/xplan-services-docker/target/docker/xplanbox/xplan-services/tmp/docker-build.tar.gz
   needs:
     - maven-prepare-docker-contexts-others
     - kaniko:xplan-docker-tomcat-gdal
@@ -147,7 +147,7 @@ kaniko:xplan-validator-api:
   extends: .kaniko:build
   variables:
     dockerImageName: xplan-validator-api
-    tarGzFile: xplan-api/xplan-api-validator/target/docker/xplanbox/xplan-validator-api/tmp/docker-build.tar.gz
+    tarGzFile: xplan-validator/xplan-validator-api/target/docker/xplanbox/xplan-validator-api/tmp/docker-build.tar.gz
   needs:
     - maven-prepare-docker-contexts-apis-and-inspire-plu
     - kaniko:xplan-docker-tomcat
@@ -157,7 +157,7 @@ kaniko:xplan-validator-web:
   extends: .kaniko:build
   variables:
     dockerImageName: xplan-validator-web
-    tarGzFile: xplan-webapps/xplan-validator-web/target/docker/xplanbox/xplan-validator-web/tmp/docker-build.tar.gz
+    tarGzFile: xplan-validator/xplan-validator-web/target/docker/xplanbox/xplan-validator-web/tmp/docker-build.tar.gz
   needs:
     - maven-prepare-docker-contexts-web-apps
     - kaniko:xplan-docker-tomcat
@@ -165,8 +165,8 @@ kaniko:xplan-validator-web:
 kaniko:xplan-validator-wms:
   extends: .kaniko:build
   variables:
-    dockerImageName: xplan-validator-wms
-    tarGzFile: xplan-webservices/xplan-validator-wms/target/docker/xplanbox/xplan-validator-wms/tmp/docker-build.tar.gz
+    dockerImageName: xplan-webservices-validator-wms
+    tarGzFile: xplan-webservices/xplan-webservices-validator-wms/target/docker/xplanbox/xplan-webservices-validator-wms/tmp/docker-build.tar.gz
   needs:
     - maven-prepare-docker-contexts-others
     - kaniko:xplan-docker-tomcat