diff --git a/templates/java/gradle/gradle-build.gitlab-ci.yml b/templates/java/gradle/gradle-build.gitlab-ci.yml
index 453bde6..f44eaca 100644
--- a/templates/java/gradle/gradle-build.gitlab-ci.yml
+++ b/templates/java/gradle/gradle-build.gitlab-ci.yml
@@ -13,7 +13,7 @@
         $(sed -i /^version/s/$GRADLE_VERSION/\'$CI_COMMIT_TAG\'/ $PATH_TO_VERSION_FILE)
       fi
   script:
-    - "./gradlew --build-cache assemble $GRADLE_CLI_BUILD_OPTS $GRADLE_CLI_OPTS"
+    - "./gradlew --build-cache assemble $GRADLE_CLI_BUILD_OPTS $GRADLE_CLI_OPTS $GRADLE_EXTRA_OPTS"
   artifacts:
     expire_in: 2 weeks
     when: on_success
diff --git a/templates/java/gradle/gradle-database-diff.gitlab-ci.yml b/templates/java/gradle/gradle-database-diff.gitlab-ci.yml
index df489a7..cf26db7 100644
--- a/templates/java/gradle/gradle-database-diff.gitlab-ci.yml
+++ b/templates/java/gradle/gradle-database-diff.gitlab-ci.yml
@@ -14,5 +14,5 @@ include:
         cd $BACKEND_DIR
       fi
   script:
-    - ./gradlew liquibase:update liquibase:diff $GRADLE_CLI_OPTS
+    - ./gradlew liquibase:update liquibase:diff $GRADLE_CLI_OPTS $GRADLE_EXTRA_OPTS
 
diff --git a/templates/java/gradle/gradle-license.gitlab-ci.yml b/templates/java/gradle/gradle-license.gitlab-ci.yml
index 1f3a3b0..b298922 100644
--- a/templates/java/gradle/gradle-license.gitlab-ci.yml
+++ b/templates/java/gradle/gradle-license.gitlab-ci.yml
@@ -8,7 +8,7 @@
       fi
   script:
     - "cd $BACKEND_DIR"
-    - "./gradlew --build-cache cyclonedxBom $GRADLE_CLI_OPTS"
+    - "./gradlew --build-cache cyclonedxBom $GRADLE_CLI_OPTS $GRADLE_EXTRA_OPTS"
   needs: []
   artifacts:
     expire_in: 2 weeks
diff --git a/templates/java/gradle/gradle-verify.gitlab-ci.yml b/templates/java/gradle/gradle-verify.gitlab-ci.yml
index 0d56fb3..93efc59 100644
--- a/templates/java/gradle/gradle-verify.gitlab-ci.yml
+++ b/templates/java/gradle/gradle-verify.gitlab-ci.yml
@@ -7,7 +7,7 @@
         cd $BACKEND_DIR
       fi
   script:
-    - "./gradlew --build-cache test $GRADLE_CLI_OPTS"
+    - "./gradlew --build-cache test $GRADLE_CLI_OPTS $GRADLE_EXTRA_OPTS"
   artifacts:
     expire_in: 2 weeks
     reports:
diff --git a/templates/java/maven/maven-build.gitlab-ci.yml b/templates/java/maven/maven-build.gitlab-ci.yml
index e719459..96be9dc 100644
--- a/templates/java/maven/maven-build.gitlab-ci.yml
+++ b/templates/java/maven/maven-build.gitlab-ci.yml
@@ -8,7 +8,7 @@
       fi
     - >
       if [ ! -z "$CI_COMMIT_TAG" ]; then
-        mvn $MVN_EXTRA_ARGS $MAVEN_CLI_OPTS versions:set -DnewVersion=$CI_COMMIT_TAG -DgenerateBackupPoms=false
+        mvn $MAVEN_CLI_OPTS  $MAVEN_EXTRA_OPTS versions:set -DnewVersion=$CI_COMMIT_TAG -DgenerateBackupPoms=false $MVN_EXTRA_ARGS
       fi
   script:
     - "cd $BACKEND_DIR"
diff --git a/templates/java/maven/maven-database-diff.gitlab-ci.yml b/templates/java/maven/maven-database-diff.gitlab-ci.yml
index 974cf31..4644a24 100644
--- a/templates/java/maven/maven-database-diff.gitlab-ci.yml
+++ b/templates/java/maven/maven-database-diff.gitlab-ci.yml
@@ -14,7 +14,7 @@ include:
         cd $BACKEND_DIR
       fi
   script:
-    - mvn compile liquibase:update liquibase:diff $MAVEN_EXTRA_OPTS
+    - mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS compile liquibase:update liquibase:diff $MVN_EXTRA_ARGS
   artifacts:
     when: on_failure
     expire_in: 2 weeks
diff --git a/templates/java/maven/maven-dependencies.gitlab-ci.yml b/templates/java/maven/maven-dependencies.gitlab-ci.yml
index 1cf5920..414da79 100644
--- a/templates/java/maven/maven-dependencies.gitlab-ci.yml
+++ b/templates/java/maven/maven-dependencies.gitlab-ci.yml
@@ -7,4 +7,4 @@
         cd $BACKEND_DIR
       fi
   script:
-    - "mvn $MAVEN_CLI_OPTS dependency:resolve"
\ No newline at end of file
+    - mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS dependency:resolve $MVN_EXTRA_ARGS
\ No newline at end of file
diff --git a/templates/java/maven/maven-license.gitlab-ci.yml b/templates/java/maven/maven-license.gitlab-ci.yml
index a7fff6e..f8c1b64 100644
--- a/templates/java/maven/maven-license.gitlab-ci.yml
+++ b/templates/java/maven/maven-license.gitlab-ci.yml
@@ -7,7 +7,7 @@
         cd $BACKEND_DIR
       fi
   script:
-    - mvn cyclonedx:makeBom
+    - mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS  cyclonedx:makeBom $MVN_EXTRA_ARGS
   artifacts:
     when: always
     paths:
diff --git a/templates/java/maven/maven-verify.gitlab-ci.yml b/templates/java/maven/maven-verify.gitlab-ci.yml
index 3ddf4ca..029102c 100644
--- a/templates/java/maven/maven-verify.gitlab-ci.yml
+++ b/templates/java/maven/maven-verify.gitlab-ci.yml
@@ -7,7 +7,7 @@
         cd $BACKEND_DIR
       fi
   script:
-    - mvn $MAVEN_CLI_OPTS verify
+    - mvn $MAVEN_CLI_OPTS $MAVEN_EXTRA_OPTS verify $MVN_EXTRA_ARGS
   artifacts:
     expire_in: 2 weeks
     reports:
diff --git a/templates/static-analysis/sonar-7.gitlab-ci.yml b/templates/static-analysis/sonar-7.gitlab-ci.yml
index 7288223..1564dd0 100644
--- a/templates/static-analysis/sonar-7.gitlab-ci.yml
+++ b/templates/static-analysis/sonar-7.gitlab-ci.yml
@@ -18,7 +18,7 @@
         cd $BACKEND_DIR
       fi
   script:
-    - mvn $MAVEN_CLI_OPTS test sonar:sonar
+    - mvn $MAVEN_CLI_OPTS test sonar:sonar $MVN_EXTRA_ARGS
       "-Dsonar.host.url=$SONAR_HOST_URL"
       "-Dsonar.login=$SONAR_TOKEN"
       "-Dsonar.projectKey=$SONAR_PROJECT_KEY"
diff --git a/templates/static-analysis/sonar-8.gitlab-ci.yml b/templates/static-analysis/sonar-8.gitlab-ci.yml
index befef7a..f007bea 100644
--- a/templates/static-analysis/sonar-8.gitlab-ci.yml
+++ b/templates/static-analysis/sonar-8.gitlab-ci.yml
@@ -17,7 +17,7 @@
         cd $BACKEND_DIR
       fi
   script:
-    - mvn $MAVEN_CLI_OPTS test sonar:sonar
+    - mvn $MAVEN_CLI_OPTS test sonar:sonar $MVN_EXTRA_ARGS
       "-Dsonar.host.url=$SONAR_HOST_URL"
       "-Dsonar.login=$SONAR_TOKEN"
       "-Dsonar.projectKey=$SONAR_PROJECT_KEY"