diff --git a/templates/common/common-ci-variablen.gitlab-ci.yml b/templates/common/common-ci-variablen.gitlab-ci.yml
index aa5eb0c..5aa84d3 100644
--- a/templates/common/common-ci-variablen.gitlab-ci.yml
+++ b/templates/common/common-ci-variablen.gitlab-ci.yml
@@ -54,7 +54,7 @@ variables:
     description: "Additional options that are passed to gradle for faster/stable execution"
 
   GRADLE_IMAGE:
-    value: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-java-maven-base-image:java11-maven3.8.3_latest
+    value: gitlab.exxcellent.de:4567/gilden/ci/exxcellent-java-maven-base-image:java11-maven3.8.5
     description: "Default Image to use in Gradle Jobs"
   # Currently, we use the Maven image and use the Gradle Wrapper. This is slower but more compatible to your gradle scripts.
   # Please Update your Gradle Wrapper from time to time. Use Renovate to automat that task.
diff --git a/templates/documentations/documentation.gitlab-ci.yml b/templates/documentations/documentation.gitlab-ci.yml
index 49f1749..e9b6c75 100644
--- a/templates/documentations/documentation.gitlab-ci.yml
+++ b/templates/documentations/documentation.gitlab-ci.yml
@@ -31,6 +31,7 @@
   variables:
     OUTPUT_DIR: public
   script:
+    - unset GRADLE_USER_HOME
     - publish
   artifacts:
     paths: [ public/ ]
diff --git a/templates/java/gradle/gradle-database-diff.gitlab-ci.yml b/templates/java/gradle/gradle-database-diff.gitlab-ci.yml
index ba578f9..7ff8847 100644
--- a/templates/java/gradle/gradle-database-diff.gitlab-ci.yml
+++ b/templates/java/gradle/gradle-database-diff.gitlab-ci.yml
@@ -14,4 +14,8 @@ include:
         cd $BACKEND_DIR
       fi
     - ./gradlew liquibase:update liquibase:diff $GRADLE_CLI_OPTS $GRADLE_EXTRA_OPTS
-
+  artifacts:
+    when: on_failure
+    expire_in: 2 weeks
+    paths:
+      - '**/build/db-diff.xml'
diff --git a/templates/java/maven/maven-database-diff.gitlab-ci.yml b/templates/java/maven/maven-database-diff.gitlab-ci.yml
index 683e3d5..f87ae36 100644
--- a/templates/java/maven/maven-database-diff.gitlab-ci.yml
+++ b/templates/java/maven/maven-database-diff.gitlab-ci.yml
@@ -18,4 +18,4 @@ include:
     when: on_failure
     expire_in: 2 weeks
     paths:
-      - $BACKEND_DIR/target/db-diff.xml
\ No newline at end of file
+      - '**/target/db-diff.xml'
\ No newline at end of file
diff --git a/templates/license/license.gitlab-ci.yml b/templates/license/license.gitlab-ci.yml
index 7ce5190..7ef0aa5 100644
--- a/templates/license/license.gitlab-ci.yml
+++ b/templates/license/license.gitlab-ci.yml
@@ -8,9 +8,15 @@
     INVALID_LICENSE_ADOC_FILE: invalid-licenses.adoc
     NUMBER_OF_ALLOWED_FAILURES: 0
   script:
+    # If bom-file does not exist, search for it in default-maven directory
     - >
-      if [ "$BACKEND_DIR" != "" ]; then
-        cd $BACKEND_DIR
+      if [[ ! -f "$BOM_FILE" && -f "$BACKEND_DIR/target/bom.json" ]]; then
+        export BOM_FILE=$BACKEND_DIR/target/bom.json
+      fi
+    # If bom-file does not exist, search for it in default-gradle directory
+    - >
+      if [[ ! -f "$BOM_FILE" && -f "$BACKEND_DIR/build/reports/bom.json" ]]; then
+        export BOM_FILE=$BACKEND_DIR/build/reports/bom.json
       fi
     - export NUMBER_OF_INVALID_LICENSES=0
     - export INVALID_BOM_FILE=invalid-bom.json
diff --git a/templates/npm/npm-build.gitlab-ci.yml b/templates/npm/npm-build.gitlab-ci.yml
index 7fe3d4e..8cad713 100644
--- a/templates/npm/npm-build.gitlab-ci.yml
+++ b/templates/npm/npm-build.gitlab-ci.yml
@@ -8,11 +8,6 @@
       if [ "$FRONTEND_DIR" != "" ]; then
         cd $FRONTEND_DIR
       fi
-    # Requires npm > 8.X
-    - >
-      if [ "$CI_COMMIT_TAG" != "" ]; then
-         npm --no-git-tag-version version from-git
-      fi
   script:
     - npm run ci:build
   artifacts:
diff --git a/templates/static-analysis/sonar-8.gitlab-ci.yml b/templates/static-analysis/sonar-8.gitlab-ci.yml
index 6758942..2de11fc 100644
--- a/templates/static-analysis/sonar-8.gitlab-ci.yml
+++ b/templates/static-analysis/sonar-8.gitlab-ci.yml
@@ -21,9 +21,12 @@
       "-Dsonar.login=$SONAR_TOKEN"
       "-Dsonar.projectKey=$SONAR_PROJECT_KEY"
       "-Dsonar.projectName=$SONAR_PROJECT_NAME"
+      "-Dsonar.projectDescription=$CI_PROJECT_DESCRIPTION"
+      "-Dsonar.projectVersion=$CI_COMMIT_SHORT_SHA"
       "-Dsonar.exclusions=$SONAR_EXCLUSIONS"
       "-Dsonar.qualitygate.wait=$SONAR_QUALITYGATE_WAIT"
       "-Dsonar.qualitygate.timeout=$SONAR_QUALITYGATE_TIMEOUT"
+      "-Dsonar.links.scm=$CI_PROJECT_URL"
 
 .sonar-gradle:
   extends: .sonar-template-common
@@ -38,6 +41,9 @@
       "-Dsonar.login=$SONAR_TOKEN"
       "-Dsonar.projectKey=$SONAR_PROJECT_KEY"
       "-Dsonar.projectName=$SONAR_PROJECT_NAME"
+      "-Dsonar.projectDescription=$CI_PROJECT_DESCRIPTION"
+      "-Dsonar.projectVersion=$CI_COMMIT_SHORT_SHA"
       "-Dsonar.exclusions=$SONAR_EXCLUSIONS"
       "-Dsonar.qualitygate.wait=$SONAR_QUALITYGATE_WAIT"
       "-Dsonar.qualitygate.timeout=$SONAR_QUALITYGATE_TIMEOUT"
+      "-Dsonar.links.scm=$CI_PROJECT_URL"