diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ded8baf53e6cc0b5bd51125aff5abd1d028f94df..898e0eaf2f744e9921d74193b7ef1973923c3c56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ workflow:
   - when: always
 
 variables:
-  MAVEN_OPTS: "-Xmx500m -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN"
+  MAVEN_OPTS: "-Xmx500m -XX:GCLockerRetryAllocationCount=100 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN"
   MAVEN_CLI_OPTS: "--batch-mode -DinstallAtEnd=true -DdeployAtEnd=true -DskipDeployBigArtefact=true -s $CI_PROJECT_DIR/ci_settings.xml"
 
 stages:
@@ -97,15 +97,14 @@ include: ci/all-kaniko-builds.gitlab-ci.yml
 
 
 maven-release:
-#  image: maven:3.8.6-jdk-11
   image: registry.opencode.de/diplanung/ozgxplanung/mvn-build-image:latest
-  stage: deploy
+  stage: build:jvm
   rules:
   - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH
     when: never 
   - if: $OPERATION != null
     when: never 
-  - when: manual
+  - if: $CI_COMMIT_TAG
   before_script:
   - mkdir -p ~/.ssh/
   - cp $DEPLOY_PRIVATE_KEY ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
diff --git a/xplan-api/xplan-api-dokumente/.maven-dockerignore b/xplan-api/xplan-api-dokumente/.maven-dockerignore
deleted file mode 100644
index c31d316e2fa767833ca4d802db7c259b5dd61b02..0000000000000000000000000000000000000000
--- a/xplan-api/xplan-api-dokumente/.maven-dockerignore
+++ /dev/null
@@ -1,18 +0,0 @@
-.classpath
-.dockerignore
-.project
-.settings/**
-
-pom.xml
-src/**
-target/*.jar.original
-target/classes/**
-target/dependency-maven-plugin-markers/**
-target/docker
-target/generated-sources/**
-target/generated-test-sources/**
-target/m2e-wtp/**
-target/maven-*/**
-target/surefire-reports/**
-target/test-classes/**
-target/xplan-api-dokumente-*/*/**
\ No newline at end of file
diff --git a/xplan-api/xplan-api-dokumente/.maven-dockerinclude b/xplan-api/xplan-api-dokumente/.maven-dockerinclude
new file mode 100644
index 0000000000000000000000000000000000000000..fb59421b161353180fcfc72c9e17db8c759869c1
--- /dev/null
+++ b/xplan-api/xplan-api-dokumente/.maven-dockerinclude
@@ -0,0 +1,2 @@
+run.sh
+target/*-repackaged.war
\ No newline at end of file
diff --git a/xplan-api/xplan-api-manager/.maven-dockerignore b/xplan-api/xplan-api-manager/.maven-dockerignore
deleted file mode 100644
index c31d316e2fa767833ca4d802db7c259b5dd61b02..0000000000000000000000000000000000000000
--- a/xplan-api/xplan-api-manager/.maven-dockerignore
+++ /dev/null
@@ -1,18 +0,0 @@
-.classpath
-.dockerignore
-.project
-.settings/**
-
-pom.xml
-src/**
-target/*.jar.original
-target/classes/**
-target/dependency-maven-plugin-markers/**
-target/docker
-target/generated-sources/**
-target/generated-test-sources/**
-target/m2e-wtp/**
-target/maven-*/**
-target/surefire-reports/**
-target/test-classes/**
-target/xplan-api-dokumente-*/*/**
\ No newline at end of file
diff --git a/xplan-api/xplan-api-manager/.maven-dockerinclude b/xplan-api/xplan-api-manager/.maven-dockerinclude
new file mode 100644
index 0000000000000000000000000000000000000000..fb59421b161353180fcfc72c9e17db8c759869c1
--- /dev/null
+++ b/xplan-api/xplan-api-manager/.maven-dockerinclude
@@ -0,0 +1,2 @@
+run.sh
+target/*-repackaged.war
\ No newline at end of file
diff --git a/xplan-api/xplan-api-validator/.maven-dockerignore b/xplan-api/xplan-api-validator/.maven-dockerignore
deleted file mode 100644
index c10873ac5b13bb0a3559ff43e4c9e9c44dc63b3a..0000000000000000000000000000000000000000
--- a/xplan-api/xplan-api-validator/.maven-dockerignore
+++ /dev/null
@@ -1,19 +0,0 @@
-# 2023-02-07: excludes allow to reduce tar size from 217M to 98M 
-.classpath
-.dockerignore
-.project
-.settings/**
-
-pom.xml
-src/**
-target/*.jar.original
-target/classes/**
-target/dependency-maven-plugin-markers/**
-target/docker
-target/generated-sources/**
-target/generated-test-sources/**
-target/m2e-wtp/**
-target/maven-*/**
-target/surefire-reports/**
-target/test-classes/**
-target/xplan-api-validator-*/*/**
diff --git a/xplan-api/xplan-api-validator/.maven-dockerinclude b/xplan-api/xplan-api-validator/.maven-dockerinclude
new file mode 100644
index 0000000000000000000000000000000000000000..fb59421b161353180fcfc72c9e17db8c759869c1
--- /dev/null
+++ b/xplan-api/xplan-api-validator/.maven-dockerinclude
@@ -0,0 +1,2 @@
+run.sh
+target/*-repackaged.war
\ No newline at end of file