diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 5e5bafd..aaeec9b 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -14,6 +14,16 @@
     # default gerrit server definition
     server-name: 'Primary'
 
+    # Maven / Java
+    jdk: 'openjdk8'
+    onap-infra-mvn-opts: |
+        --show-version
+        --batch-mode
+        -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+        -Djenkins
+        -Dmaven.repo.local=/tmp/r
+        -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+
     # Timeout in minutes
     build-timeout: 360
     build-node: ubuntu1604-basebuild-2c-1g
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index d69e918..efc0d09 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -66,12 +66,6 @@
     builders:
       - shell: !include-raw: include-docker-login.sh
 
-- builder:
-    name: check-clm
-    builders:
-      - sonatype-clm:
-          application-name: '{application-name}'
-
 # PARAMETERS
 - parameter:
     name: infra-parameters
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 029d98a..385bd6a 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -14,7 +14,7 @@
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: 30
 
     parameters:
       - infra-parameters:
@@ -44,13 +44,7 @@
           pom: 'pom.xml'
           goals: |
               clean install dependency:tree com.sonatype.clm:clm-maven-plugin:index
-              -Pq
-              --show-version
-              --batch-mode
-              -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-              -Djenkins
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+              {onap-infra-mvn-opts}
           java-opts:
             - '-Xmx4096m -XX:MaxPermSize=512m'
           settings: '{mvn-settings}'
@@ -58,7 +52,7 @@
           global-settings: 'global-settings'
           global-settings-type: cfp
       - shell: 'find . -regex ".*karaf/target" | xargs rm -rf'
-      - check-clm:
+      - sonatype-clm:
           application-name: '{project-name}'
 
     publishers: