project-name: 'optf-cmso'
     jobs:
       - gerrit-maven-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: false
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
+          build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: false
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
             - docker.push.registry=nexus3.onap.org:10003
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/cmso'
     stream:
       - 'master':
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: 'H 11 * * *'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'optf/cmso'
     project-name: 'optf-cmso'
     branch: 'master'
     nexus-iq-namespace: 'onap-'
     project: optf/cmso
     project-name: 'optf-cmso'
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     stream:
       - 'master':
           branch: 'master'
 
           build-node: centos7-docker-8c-8g
           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'
           build-node: centos7-docker-8c-8g
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-fgps-valetapi
       - '{project-name}-{stream}-{subproject}-merge-java'
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
 
 - project:
     name: optf-fgps-docker
     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: 'optf/fgps'
     project-name: 'optf-fgps'
     branch: 'master'