diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 3fc4d33..f4d2365 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -16,7 +16,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           mvn-pom: 'distributions/msb-apigateway/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
@@ -31,7 +31,7 @@
     mvn-settings: 'msb-apigateway-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: msb-apigateway-arm64
@@ -62,7 +62,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: 'msb/apigateway'
     project-name: 'msb-apigateway'
     branch: 'master'
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index cbe5505..84d75c8 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -10,7 +10,7 @@
           build-node: centos7-builder-4c-4g
           maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -25,7 +25,7 @@
     mvn-settings: 'msb-discovery-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 #- project:
 #    name: msb-discovery-arm64
@@ -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: 'msb/discovery'
     project-name: 'msb-discovery'
     branch: 'master'
diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index 9e37e17..c7bb49b 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -16,7 +16,7 @@
     mvn-settings: 'msb-java-sdk-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: msb-java-sdk-sonar
@@ -28,7 +28,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: 'msb/java-sdk'
     project-name: 'msb-java-sdk'
     branch: 'master'
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 2f0c3e9..376cc1a 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -16,7 +16,7 @@
     mvn-settings: 'msb-swagger-sdk-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: msb-swagger-sdk-sonar
@@ -28,7 +28,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: 'msb/swagger-sdk'
     project-name: 'msb-swagger-sdk'
     branch: 'master'