diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml
index e5b29ba..c6c3f56 100644
--- a/jjb/ccsdk/apps.yaml
+++ b/jjb/ccsdk/apps.yaml
@@ -17,7 +17,7 @@
           sign-artifacts: true
           cron: ''
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -41,7 +41,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -55,7 +55,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/apps'
     project-name: 'ccsdk-apps'
     branch: 'master'
@@ -78,7 +78,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-apps-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: ccsdk-apps-arm64-docker
diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml
index 61435e7..beb0c17 100644
--- a/jjb/ccsdk/cds.yaml
+++ b/jjb/ccsdk/cds.yaml
@@ -12,7 +12,7 @@
           maven-versions-plugin: true
           cron: ''
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -39,7 +39,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -53,7 +53,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/cds'
     project-name: 'ccsdk-cds'
     branch: 'master'
@@ -76,7 +76,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-cds-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 764aba8..353ee2d 100644
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -12,7 +12,7 @@
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -32,7 +32,7 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index aacfe89..218bd2b 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -12,7 +12,7 @@
           maven-versions-plugin: true
           cron: ''
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -P docker'
@@ -33,7 +33,7 @@
     maven-version: "mvn35"
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -68,7 +68,7 @@
       - 'frankfurt':
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-distribution-settings'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
 
 
 - project:
@@ -83,7 +83,7 @@
 - project:
     name: ccsdk-distribution-whitesource
     project-name: ccsdk-distribution
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-8c-8g
     jobs:
       - gerrit-whitesource-scan:
           java-opts: '-Xmx2048m'
diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml
index 0a0120e..d5fb682 100644
--- a/jjb/ccsdk/features.yaml
+++ b/jjb/ccsdk/features.yaml
@@ -29,7 +29,7 @@
     archive-artifacts: ''
     maven-version: "mvn35"
     mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -43,7 +43,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/features'
     project-name: 'ccsdk-features'
     branch: 'master'
@@ -66,7 +66,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-features-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: ccsdk-features-info
@@ -79,7 +79,7 @@
 
 - project:
     name: ccsdk-features-whitesource
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-8c-8g
     project-name: ccsdk-features
     jobs:
       - gerrit-whitesource-scan
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index a29b096..0d3a3ee 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -45,7 +45,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-parent-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml
index 8b65dc8..0f2f046 100644
--- a/jjb/ccsdk/sli-adaptors.yaml
+++ b/jjb/ccsdk/sli-adaptors.yaml
@@ -31,7 +31,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -45,7 +45,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/sli/adaptors'
     project-name: 'ccsdk-sli-adaptors'
     branch: 'master'
@@ -68,7 +68,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-adaptors-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
@@ -82,7 +82,7 @@
 
 - project:
     name: ccsdk-sli-adaptors-whitesource
-    build-node: ubuntu1604-builder-8c-8g
+    build-node: ubuntu1804-builder-8c-8g
     project-name: ccsdk-sli-adaptors
     jobs:
       - gerrit-whitesource-scan
diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml
index 946a4fb..0fc6d6c 100644
--- a/jjb/ccsdk/sli-core.yaml
+++ b/jjb/ccsdk/sli-core.yaml
@@ -31,7 +31,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -45,7 +45,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/sli/core'
     project-name: 'ccsdk-sli-core'
     branch: 'master'
@@ -68,7 +68,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-core-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml
index 8cd692b..d130cb1 100644
--- a/jjb/ccsdk/sli-northbound.yaml
+++ b/jjb/ccsdk/sli-northbound.yaml
@@ -31,7 +31,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -45,7 +45,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/sli/northbound'
     project-name: 'ccsdk-sli-northbound'
     branch: 'master'
@@ -68,7 +68,7 @@
           branch: 'frankfurt'
     mvn-settings: 'ccsdk-sli-northbound-settings'
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 
 - project:
diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml
index aec06db..4f99ad8 100644
--- a/jjb/ccsdk/sli-plugins.yaml
+++ b/jjb/ccsdk/sli-plugins.yaml
@@ -31,7 +31,7 @@
     files: '**'
     archive-artifacts: ''
     maven-version: "mvn35"
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -45,7 +45,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'ccsdk/sli/plugins'
     project-name: 'ccsdk-sli-plugins'
     branch: 'master'