diff --git a/documentation/chapters/templates/java/gradle/gradle-build-template.adoc b/documentation/chapters/templates/java/gradle/gradle-build-template.adoc
index bb4073f..e5bf00c 100644
--- a/documentation/chapters/templates/java/gradle/gradle-build-template.adoc
+++ b/documentation/chapters/templates/java/gradle/gradle-build-template.adoc
@@ -10,6 +10,7 @@ The resulting build files will be published as artefacts.
 |===
 |Name |Description | Default Value
 |GRADLE_CLI_OPTS | Additional Options that will be passed to Gradle | ""
+|GRADLE_CLI_BUILD_OPTS | Additional Options that will be passed to Gradle while Building | ""
 |===
 
 .gradle-build-template
diff --git a/documentation/chapters/templates/java/maven/maven-build-template.adoc b/documentation/chapters/templates/java/maven/maven-build-template.adoc
index 7e2c299..c23f011 100644
--- a/documentation/chapters/templates/java/maven/maven-build-template.adoc
+++ b/documentation/chapters/templates/java/maven/maven-build-template.adoc
@@ -7,6 +7,7 @@ These Templates will build a .jar file with Maven and provides it as an Artifact
 .Variables
 |===
 |Name |Description | Default Value
+|MAVEN_CLI_BUILD_OPTS | Additional Options that will be passed to Maven while Building | ""
 |===
 
 .mvn-build-template
diff --git a/pipelines/java-maven.gitlab-ci.yml b/pipelines/java-maven.gitlab-ci.yml
index ca9a325..9a7c00e 100644
--- a/pipelines/java-maven.gitlab-ci.yml
+++ b/pipelines/java-maven.gitlab-ci.yml
@@ -27,14 +27,6 @@ Test-Java:
     - job: "Build-Java"
       artifacts: true
 
-#todo put this into backend template
-#Database-Diff:
-#  extends:
-#    - .maven-database-diff
-#  needs:
-#    - job: "Build-Java"
-#      artifacts: true
-
 Repo-CVE-Scan:
   allow_failure: true
   extends: .repo-cve-scan-trivy
diff --git a/templates/java/gradle/gradle-build.gitlab-ci.yml b/templates/java/gradle/gradle-build.gitlab-ci.yml
index d9fab40..f123165 100644
--- a/templates/java/gradle/gradle-build.gitlab-ci.yml
+++ b/templates/java/gradle/gradle-build.gitlab-ci.yml
@@ -9,7 +9,7 @@
         $(sed -i /^version/s/$GRADLE_VERSION/\'$CI_COMMIT_TAG\'/ $PATH_TO_VERSION_FILE)
       fi
   script:
-    - "./gradlew --build-cache assemble $GRADLE_CLI_OPTS"
+    - "./gradlew --build-cache assemble $GRADLE_CLI_BUILD_OPTS $GRADLE_CLI_OPTS"
   artifacts:
     expire_in: 2 weeks
     when: on_success
diff --git a/templates/java/maven/maven-build.gitlab-ci.yml b/templates/java/maven/maven-build.gitlab-ci.yml
index d86ab0e..0ffff2e 100644
--- a/templates/java/maven/maven-build.gitlab-ci.yml
+++ b/templates/java/maven/maven-build.gitlab-ci.yml
@@ -9,7 +9,7 @@
       fi
   script:
     - "cd $BACKEND_DIR"
-    - mvn $MAVEN_CLI_OPTS package -DskipTests
+    - mvn $MAVEN_CLI_OPTS package $MAVEN_CLI_BUILD_OPTS -DskipTests
   artifacts:
     expire_in: 2 weeks
     when: always