diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af636f6f87cc09db4b2e86125e324563b695d1e6..2c7f4d850359fe1ed8a50448944486e394ebba18 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,7 @@ maven-prepare-docker-contexts-apis-and-inspire-plu:
   variables:
     mvnProjects: ':xplan-validator-api,:xplan-manager-api,:xplan-dokumente-api,:xplan-webservices-inspireplu'
   artifacts:
-    paths:
+    paths: # 2024.02.02: ~387M
     - './xplan-validator/xplan-validator-api/target/docker/**/tmp/docker-build.tar.gz'
     - './xplan-manager/xplan-manager-api/target/docker/**/tmp/docker-build.tar.gz'
     - './xplan-dokumente/xplan-dokumente-api/target/docker/**/tmp/docker-build.tar.gz'
@@ -78,17 +78,19 @@ maven-prepare-docker-contexts-apis-and-inspire-plu:
 maven-prepare-docker-contexts-cli:
   extends: .maven-prepare-docker-contexts
   variables:
-    mvnProjects: ':xplan-cli-docker'
+    mvnProjects: ':xplan-benutzerhandbuch,:xplan-betriebshandbuch,:xplan-cli-docker,:xplan-database-docker,:xplan-webpages'
   artifacts:
-    paths:
-    - './xplan-cli/**/target/docker/**/tmp/docker-build.tar.gz'
+    paths: # 2024.02.02: ~371M
+    - './xplan-cli/xplan-cli-docker/target/docker/**/docker-build.tar.gz'
+    - './xplan-documentation/**/target/docker/**/docker-build.tar.gz'
+    - './xplan-database/xplan-database-docker/target/docker/**/docker-build.tar.gz'
 
 maven-prepare-docker-contexts-web-apps:
   extends: .maven-prepare-docker-contexts
   variables:
     mvnProjects: ':xplan-manager-web,:xplan-validator-web,:xplan-webpages'
   artifacts:
-    paths:
+    paths: # 2024.02.02: ~481M
     - './xplan-manager/xplan-manager-web/target/docker/**/tmp/docker-build.tar.gz'
     - './xplan-validator/xplan-validator-web/target/docker/**/tmp/docker-build.tar.gz'
     - './xplan-documentation/xplan-webpages/target/docker/**/tmp/docker-build.tar.gz'
@@ -98,7 +100,7 @@ maven-prepare-docker-contexts-others:
   variables:
     mvnProjects: ':xplan-docker-tomcat,:xplan-docker-tomcat-gdal,:xplan-database-scripts,:xplan-mapproxy-docker,:xplan-mapserver-docker,:xplan-webservices-validator-wms,:xplan-services-docker,:xplan-tests-soapui'
   artifacts:
-    paths:
+    paths: # 2024.02.02: ~432M
     - './xplan-docker/**/target/docker/**/tmp/docker-build.tar.gz'
     - './xplan-database/xplan-database-scripts/target/docker/**/tmp/docker-build.tar.gz'
     - './xplan-tests/xplan-tests-soapui/target/docker/**/tmp/docker-build.tar.gz'
diff --git a/ci/all-kaniko-builds.gitlab-ci.yml b/ci/all-kaniko-builds.gitlab-ci.yml
index 7655554e0be2c992d2c58d10d37cc171eb6a56ab..8038a7f1cdeb6251fb28106baa74842cf50433ee 100644
--- a/ci/all-kaniko-builds.gitlab-ci.yml
+++ b/ci/all-kaniko-builds.gitlab-ci.yml
@@ -25,6 +25,22 @@
 
 ## job per image to produce
 
+kaniko:xplan-benutzerhandbuch:
+  extends: .kaniko:build
+  variables:
+    dockerImageName: xplan-benutzerhandbuch
+    tarGzFile: xplan-documentation/xplan-benutzerhandbuch/target/docker/xplanbox/xplan-benutzerhandbuch/tmp/docker-build.tar.gz
+  needs:
+    - maven-prepare-docker-contexts-cli
+
+kaniko:xplan-betriebshandbuch:
+  extends: .kaniko:build
+  variables:
+    dockerImageName: xplan-betriebshandbuch
+    tarGzFile: xplan-documentation/xplan-betriebshandbuch/target/docker/xplanbox/xplan-betriebshandbuch/tmp/docker-build.tar.gz
+  needs:
+    - maven-prepare-docker-contexts-cli
+
 kaniko:xplan-cli-docker:
   extends: .kaniko:build
   variables:
@@ -34,6 +50,14 @@ kaniko:xplan-cli-docker:
     - maven-prepare-docker-contexts-cli
     - kaniko:xplan-docker-volume-init
 
+kaniko:xplan-database-docker:
+  extends: .kaniko:build
+  variables:
+    dockerImageName: xplan-db
+    tarGzFile: xplan-database/xplan-database-docker/target/docker/xplanbox/xplan-db/tmp/docker-build.tar.gz
+  needs:
+    - maven-prepare-docker-contexts-cli
+
 kaniko:xplan-db-updater:
   extends: .kaniko:build
   variables:
@@ -170,3 +194,11 @@ kaniko:xplan-validator-wms:
   needs:
     - maven-prepare-docker-contexts-others
     - kaniko:xplan-docker-tomcat
+
+kaniko:xplan-webpages:
+  extends: .kaniko:build
+  variables:
+    dockerImageName: xplan-webpages
+    tarGzFile: xplan-documentation/xplan-webpages/target/docker/xplanbox/xplan-webpages/tmp/docker-build.tar.gz
+  needs:
+    - maven-prepare-docker-contexts-cli