diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index 9a2c190..8a3f8e8 100644
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -19,7 +19,7 @@
     mvn-settings: 'appc-cdt-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: appc-cdt-clm
diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index ee14b23..4fdbb66 100644
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -17,7 +17,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: appc-deployment-docker
@@ -28,7 +28,7 @@
       - 'docker-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           mvn-params: '-Dmaven.test.skip=true -P docker'
           maven-versions-plugin: true
           mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
@@ -45,7 +45,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 #- project:
 #    name: appc-deployment-arm64-docker
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index dd7353f..404fe9e 100644
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -4,11 +4,11 @@
     project-name: 'appc'
     jobs:
       - '{project-name}-{stream}-verify-java':
-          build-node: ubuntu1604-builder-8c-8g
+          build-node: ubuntu1804-builder-8c-8g
           mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
           java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
       - '{project-name}-{stream}-merge-java':
-          build-node: ubuntu1604-builder-8c-8g
+          build-node: ubuntu1804-builder-8c-8g
           mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
           java-opts: "-Xmx4000m -XX:MaxPermSize=256m"
       - gerrit-maven-stage:
@@ -30,7 +30,7 @@
     maven-version: "mvn35"
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: appc-sonar
@@ -42,7 +42,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-8c-8g
     project: 'appc'
     project-name: 'appc'
     branch: 'master'
@@ -57,7 +57,7 @@
       - gerrit-maven-clm:
           mvn-params: '-DskipTests'
           build-timeout: 60
-          build-node: ubuntu1604-builder-8c-8g
+          build-node: ubuntu1804-builder-8c-8g
           mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m"
     nexus-iq-namespace: 'onap-'
     project: 'appc'