diff --git a/jjb/acumos/global-templates-acumos-java.yaml b/jjb/acumos/global-templates-acumos-java.yaml
index 2ea9d53..0ea0ee6 100644
--- a/jjb/acumos/global-templates-acumos-java.yaml
+++ b/jjb/acumos/global-templates-acumos-java.yaml
@@ -1,10 +1,7 @@
 - job-template:
     name: 'acumos-{project-name}-verify-java'
-
-    node: acumos-ubuntu1604
-
+    node: acumos-ubuntu1804
     disabled: false
-
     concurrent: true
 
     properties:
@@ -18,7 +15,7 @@
           description: JJB configured PROJECT parameter to identify a Nordix Gerrit project
       - string:
           name: JAVA_HOME
-          default: /usr/lib/jvm/java-1.8.0-openjdk-amd64
+          default: '/usr/lib/jvm/{jdk-version}-openjdk-amd64'
           description: Java home
       - string:
           name: MVN_VERSION